Merge tag 'upstream/1.2.0' into tizen_base

[platform/upstream/libsndfile.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7b4fa61..5769c07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -154,7 +154,7 @@ AC_ARG_ENABLE([alsa],
        [AS_HELP_STRING([--disable-alsa], [disable ALSA support (default=autodetect)])], [], [enable_alsa=auto])
 
 AC_ARG_ENABLE([external-libs],
-       [AS_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis [[default=no]]])])
+       [AS_HELP_STRING([--disable-external-libs], [disable use of Ogg and Vorbis [[default=no]]])])
 
 AC_ARG_ENABLE([mpeg],
        [AS_HELP_STRING([--disable-mpeg], [disable use of LAME/MPG123 for MPEG (MP3) [[defaults=no]]])])
@@ -278,7 +278,7 @@ AS_IF([test "x$cross_compiling" = "xno"], [
        ])
 
 dnl ====================================================================================
-dnl  Check for Ogg, Vorbis and FLAC.
+dnl  Check for Ogg, Vorbis.
 
 HAVE_EXTERNAL_XIPH_LIBS=0
 EXTERNAL_XIPH_CFLAGS=""
@@ -292,13 +292,8 @@ PKG_INSTALLDIR
 
 AS_IF([test -n "$PKG_CONFIG"], [
                AS_IF([test "x$enable_external_libs" = "xno"], [
-                               AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]])
+                               AC_MSG_WARN([[*** External libs (Ogg, Vorbis) disabled. ***]])
                        ], [
-                               PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.3.1, ac_cv_flac=yes, ac_cv_flac=no)
-
-                               dnl Make sure the FLAC_CFLAGS value is sane.
-                               FLAC_CFLAGS=`echo $FLAC_CFLAGS | $SED "s|include/FLAC|include|"`
-
                                PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.3.0, ac_cv_ogg=yes, ac_cv_ogg=no)
 
                                AS_IF([test "x$enable_experimental" = "xyes"], [
@@ -318,20 +313,20 @@ AS_IF([test -n "$PKG_CONFIG"], [
                                enable_external_libs=yes
                        ])
 
-                       AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [
+                       AS_IF([test "x$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyes"], [
                                        HAVE_EXTERNAL_XIPH_LIBS=1
                                        enable_external_libs=yes
 
-                                       EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS "
-                                       EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS "
-                                       EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus"
+                                       EXTERNAL_XIPH_CFLAGS="$VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS "
+                                       EXTERNAL_XIPH_LIBS="$VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS "
+                                       EXTERNAL_XIPH_REQUIRE="ogg vorbis vorbisenc opus"
 
                                        if test x$ac_cv_speex = "xyes" ; then
                                                EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex"
                                        fi
                                ], [
                                        AS_ECHO([""])
-                                       AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg,]])
+                                       AC_MSG_WARN([[*** One or more of the external libraries (ie libogg,]])
                                        AC_MSG_WARN([[*** libvorbis and libopus) is either missing (possibly only the development]])
                                        AC_MSG_WARN([[*** headers) or is of an unsupported version.]])
                                        AC_MSG_WARN([[***]])
@@ -342,7 +337,7 @@ AS_IF([test -n "$PKG_CONFIG"], [
                                ])
        ])
 
-AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], [$HAVE_EXTERNAL_XIPH_LIBS], [Will be set to 1 if flac, ogg, vorbis, and opus are available.])
+AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], [$HAVE_EXTERNAL_XIPH_LIBS], [Will be set to 1 if ogg, vorbis, and opus are available.])
 
 dnl ====================================================================================
 dnl  Check for MPEG libraris liblame
@@ -707,7 +702,7 @@ dnl ============================================================================
 AS_IF([test -z "$PKG_CONFIG"], [
                AS_ECHO(["    *****************************************************************"])
                AS_ECHO(["    ***          The pkg-config program is missing.               ***"])
-               AS_ECHO(["    *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***"])
+               AS_ECHO(["    ***   External Ogg/Vorbis libs cannot be found without it.    ***"])
                AS_ECHO(["    ***       http://pkg-config.freedesktop.org/wiki/             ***"])
                AS_ECHO(["    *****************************************************************"])
        ])
@@ -734,7 +729,7 @@ AC_MSG_RESULT([
 
     Experimental code : ................... ${enable_experimental:-no}
     Using ALSA in example programs : ...... ${enable_alsa:-no}
-    External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no}
+    External Ogg/Vorbis/Opus : ............ ${enable_external_libs:-no}
     External MPEG Lame/MPG123 : ........... ${enable_mpeg:-no}
     Building Octave interface : ........... ${OCTAVE_BUILD}