added --disable-ogg option for building without Ogg support even if libogg is install...

diff --git a/configure.in b/configure.in
index 275d84a..fe542dc 100644 (file)
--- 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 (file)
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -107,6 +107,7 @@
                                <ul>
                                        <li>Fixed a makefile linkage bug with libogg (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1611414&amp;group_id=13478&amp;atid=113478">SF #1611414</a>).</li>
                                        <li>Added pkg-config files for libFLAC and libFLAC++ (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1647881&amp;group_id=13478&amp;atid=313478">SF #1647881</a>).</li>
+                                       <li>Added <span class=argument>--disable-ogg</span> option for building without Ogg support even if libogg is installed (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1196996&amp;group_id=13478&amp;atid=113478">SF #1196996</a>).</li>
                                </ul>
                        </li>
                        <li>