From c0f51e77bcece32a481889d8f2b2bf79efd607a1 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 9 Feb 2007 16:18:38 +0000 Subject: [PATCH] added --disable-ogg option for building without Ogg support even if libogg is installed (SF#1196996: http://sourceforge.net/tracker/index.php?func=detail&aid=1196996&group_id=13478&atid=113478 --- configure.in | 9 ++++++++- doc/html/changelog.html | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 275d84a..fe542dc 100644 --- a/configure.in +++ b/configure.in @@ -220,7 +220,14 @@ fi AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR") dnl check for ogg library -XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) +AC_ARG_ENABLE([ogg], + AC_HELP_STRING([--disable-ogg], [Disable ogg support (default: test for libogg)]), + [ want_ogg=$enableval ], [ want_ogg=yes ] ) + +if test "x$want_ogg" != "xno"; then + XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) +fi + AM_CONDITIONAL(FLaC__HAS_OGG, [test "x$have_ogg" = xyes]) if test "x$have_ogg" = xyes ; then AC_DEFINE(FLAC__HAS_OGG) diff --git a/doc/html/changelog.html b/doc/html/changelog.html index 7950a9b..f5616b9 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -107,6 +107,7 @@
  • -- 2.7.4