[xiph-commits] r3286 - libfishsound/branches/1.0-stable-flac

[conrad at svn.annodex.net]

Author: conrad
Date: 2007-12-04 17:39:44 -0800 (Tue, 04 Dec 2007)
New Revision: 3286

Modified:
   libfishsound/branches/1.0-stable-flac/configure.ac
Log:
raw commit of libfishsound-flac-3.patch (final) from Tobias Gehrig
http://www.annodex.net/software/libfishsound/libfishsound-flac/
(build failure)


Modified: libfishsound/branches/1.0-stable-flac/configure.ac
===================================================================
--- libfishsound/branches/1.0-stable-flac/configure.ac	2007-12-05 01:35:39 UTC (rev 3285)
+++ libfishsound/branches/1.0-stable-flac/configure.ac	2007-12-05 01:39:44 UTC (rev 3286)
@@ -256,20 +256,20 @@
      [ ac_enable_flac=no ], [ ac_enable_flac=yes] )
 
 if test "x${ac_enable_flac}" = xyes ; then
-  AC_CHECK_LIB(OggFLAC, FLAC__file_decoder_init, HAVE_FLAC="maybe", , [-lm -logg])
+   AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init, HAVE_FLAC="maybe", , [-lm -logg])
   if test "x$HAVE_FLAC" = xmaybe; then
     AC_CHECK_HEADER(FLAC/all.h, HAVE_FLAC="yes", HAVE_FLAC="no")
   fi
   if test "x$HAVE_FLAC" = xyes ; then
-    AC_DEFINE(HAVE_FLAC, [1], [Define to 1 if you have libOggFLAC])
+    AC_DEFINE(HAVE_FLAC, [1], [Define to 1 if you have libFLAC])
     FLAC_LIBS="-lFLAC -logg -lm"
     AC_SUBST(FLAC_LIBS)
     FLAC_SUPPORT="yes"
   else
-    AC_DEFINE(HAVE_FLAC, [0], [Define to 1 if you have libOggFLAC])
+    AC_DEFINE(HAVE_FLAC, [0], [Define to 1 if you have libFLAC])
   fi
 else
-  AC_DEFINE(HAVE_FLAC, [0], [Define to 1 if you have libOggFLAC])
+  AC_DEFINE(HAVE_FLAC, [0], [Define to 1 if you have libFLAC])
   FLAC_SUPPORT="disabled"
 fi
 AM_CONDITIONAL(HAVE_FLAC, [test "x$HAVE_FLAC" = "xyes"])
@@ -391,11 +391,11 @@
 
 if test "x$HAVE_FLAC" != xyes ; then
     AC_MSG_RESULT(
-[*** libOggFLAC, available from  http://flac.sourceforge.net/])
+[*** libFLAC, available from  http://flac.sourceforge.net/])
 fi
 if test "x$HAVE_FLAC" = xmaybe ; then
     AC_MSG_RESULT(
-[      Development files missing: The libOggFLAC library binary seems to be
+[      Development files missing: The libFLAC library binary seems to be
       installed, but building of a test program failed.
 ])
 fi