* Replace --enable-flac configure option with --with-libflac, as the FLAC

    support is always built-in through the audio demuxer plugin and the FFmpeg
    decoder plugin, the option only controls the extra FLAC plugin that uses
    libFLAC both for demuxing and decoding.

CVS patchset: 8457
CVS date: 2006/12/25 20:04:17

3 files changed, 21 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index f44c9f506..2dba4f5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@ xine-lib (1.1.4)
     FLAC release 1.1.3.
   * On platforms where it's possible, use "-Wl,-z,defs" option so that the linker
     reports undefined symbols at buildtime, rather than aborting at runtime.
+  * Replace --enable-flac configure option with --with-libflac, as the FLAC
+    support is always built-in through the audio demuxer plugin and the FFmpeg
+    decoder plugin, the option only controls the extra FLAC plugin that uses
+    libFLAC both for demuxing and decoding.
 
 xine-lib (1.1.3)
   * Security fixes:
diff --git a/configure.ac b/configure.ac
index a8f5c43b8..d710c6e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1154,17 +1154,15 @@ dnl ---------------------------------------------
 dnl check for libFLAC
 dnl ---------------------------------------------
 
-AC_ARG_ENABLE([flac],
-  AC_HELP_STRING([--disable-flac], [do not build flac support]),
-  [with_flac=$enableval], [with_flac=yes])
+AC_ARG_WITH([libflac],
+  AC_HELP_STRING([--with-libflac], [build libFLAC-based decoder and demuxer]))
 
-if test "x$with_flac" = "xyes"; then
-  AM_PATH_LIBFLAC([],
-    AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
-else
-  no_libFLAC=yes
+have_libflac="no"
+if test "x$with_libflac" = "xyes"; then
+  AM_PATH_LIBFLAC([have_libflac="yes"])
 fi
-AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
+
+AM_CONDITIONAL([HAVE_LIBFLAC], [test "x$have_libflac" = "xyes"])
 
 dnl ---------------------------------------------
 dnl External version of a52dec
@@ -2602,7 +2600,7 @@ echo "   - interplay mve - psx str"
 echo "   - ws aud        - pva"
 echo "   - vox           - nsf"
 echo "   - nsv           - 4xm"
-echo "                   - aac"
+echo "   - FLAC          - aac"
 echo "   - iff           - matroska"
 echo "   - vmd           - flv"
 if test x"$enable_asf" = "xyes"; then
@@ -2617,6 +2615,9 @@ fi
 if test x"$enable_modplug" != x"no"; then
   echo "   - mod"
 fi
+if test "x$have_libflac" = "xyes"; then
+  echo "   - FLAC (with libFLAC)"
+fi
 if test x"$enable_a52dec" = "xyes"; then
   if test x"$have_a52" = "xyes"; then
     echo "   - ac3 (external library)"
@@ -2684,8 +2685,9 @@ echo "     - 14k4          - 28k8"
 echo "     - MS ADPCM      - IMA ADPCM"
 echo "     - XA ADPCM      - Game DPCM/ADPCM"
 echo "     - Mace 3:13     - Mace 6:1"
-if test x"no_libFLAC" != "xyes"; then
-  echo "     - FLAC"
+echo "     - FLAC"
+if test "x$have_libflac" = "xyes"; then
+  echo "   - FLAC (with libFLAC)"
 fi
 if test "x$have_vorbis" = "xyes"; then
   echo "   - vorbis"
diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am
index 12304ff84..6449820bc 100644
--- a/src/libflac/Makefile.am
+++ b/src/libflac/Makefile.am
@@ -1,12 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-if HAVE_FLAC
-flac_module = xineplug_flac.la
-endif
-
 libdir = $(XINE_PLUGINDIR)
 
-lib_LTLIBRARIES = $(flac_module)
+if HAVE_LIBFLAC
+lib_LTLIBRARIES = xineplug_flac.la
+endif
 
 xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
 xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS) $(XINE_LIB)