Patch from Gentoo bug #141661 to not override Ogg's own --with-ogg switch (http://bugs.gentoo.org/show_bug.cgi?id=141661)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@615 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
62f76a1adf
commit
3376c0909f
24
configure.ac
24
configure.ac
|
@ -50,23 +50,15 @@ else
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --without-openal will build without OpenAL
|
# --disable-ogg will build without Ogg Vorbis support
|
||||||
# Commented out as OpenAL is not curently an option,
|
AC_ARG_ENABLE(ogg,
|
||||||
# but it will need to become optional someday.
|
[AC_HELP_STRING([--disable-ogg],[Do not built support for Ogg files])],
|
||||||
#AC_ARG_WITH(openal,
|
[ ogg=$enableval ], [ ogg=maybe ])
|
||||||
#[ --with-openal use OpenAL for sound [[auto]]],
|
|
||||||
#[ openal=$withval ], [ openal=maybe ])
|
|
||||||
openal=yes
|
|
||||||
|
|
||||||
# --without-ogg will build without Ogg vorbis support
|
# --disable-mp3 will build without Mp3 support
|
||||||
AC_ARG_WITH(ogg,
|
AC_ARG_ENABLE(mp3,
|
||||||
[ --with-ogg built support for Ogg files [[auto]]],
|
[AC_HELP_STRING([--disable-mp3],[Do not built support for Mp3 files])],
|
||||||
[ ogg=$withval ], [ ogg=maybe ])
|
[ mp3=$enableval ], [ mp3=maybe ])
|
||||||
|
|
||||||
# --without-mp3 will build without MP3 support
|
|
||||||
AC_ARG_WITH(mp3,
|
|
||||||
[ --with-mp3 built support for Mp3 files [[auto]]],
|
|
||||||
[ mp3=$withval ], [ mp3=maybe ])
|
|
||||||
|
|
||||||
# windows conditional
|
# windows conditional
|
||||||
case $host_os in
|
case $host_os in
|
||||||
|
|
Loading…
Reference in New Issue