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-861f7616d084
master
Dennis Schridde 2006-08-23 13:53:47 +00:00
parent 62f76a1adf
commit 3376c0909f
1 changed files with 8 additions and 16 deletions

View File

@ -50,23 +50,15 @@ else
AC_MSG_RESULT([no])
fi
# --without-openal will build without OpenAL
# Commented out as OpenAL is not curently an option,
# but it will need to become optional someday.
#AC_ARG_WITH(openal,
#[ --with-openal use OpenAL for sound [[auto]]],
#[ openal=$withval ], [ openal=maybe ])
openal=yes
# --disable-ogg will build without Ogg Vorbis support
AC_ARG_ENABLE(ogg,
[AC_HELP_STRING([--disable-ogg],[Do not built support for Ogg files])],
[ ogg=$enableval ], [ ogg=maybe ])
# --without-ogg will build without Ogg vorbis support
AC_ARG_WITH(ogg,
[ --with-ogg built support for Ogg files [[auto]]],
[ ogg=$withval ], [ ogg=maybe ])
# --without-mp3 will build without MP3 support
AC_ARG_WITH(mp3,
[ --with-mp3 built support for Mp3 files [[auto]]],
[ mp3=$withval ], [ mp3=maybe ])
# --disable-mp3 will build without Mp3 support
AC_ARG_ENABLE(mp3,
[AC_HELP_STRING([--disable-mp3],[Do not built support for Mp3 files])],
[ mp3=$enableval ], [ mp3=maybe ])
# windows conditional
case $host_os in