From 8d9848fdce392fcc5e1b8defbe73d323169b9bdc Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 21 Feb 2014 18:10:52 -0500 Subject: [PATCH] fix calling convention for PKG_CHECK_MOD_VERSION --- libs/libsndfile/configure.ac | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/libsndfile/configure.ac b/libs/libsndfile/configure.ac index 022066091d..002a6024d4 100644 --- a/libs/libsndfile/configure.ac +++ b/libs/libsndfile/configure.ac @@ -295,8 +295,6 @@ HAVE_EXTERNAL_LIBS=0 EXTERNAL_CFLAGS="" EXTERNAL_LIBS="" -enable_external_libs=no - # Check for pkg-config outside the if statement. PKG_PROG_PKG_CONFIG m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig)) @@ -305,15 +303,15 @@ if test -n "$PKG_CONFIG" ; then if test x$enable_external_libs = xno ; then AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) else - PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.2.1, ac_cv_flac=yes, ac_cv_flac=no) + PKG_CHECK_MOD_VERSION([FLAC], flac >= 1.2.1, ac_cv_flac=yes, ac_cv_flac=no) # 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.1.3, ac_cv_ogg=yes, ac_cv_ogg=no) + PKG_CHECK_MOD_VERSION([OGG], ogg >= 1.1.3, ac_cv_ogg=yes, ac_cv_ogg=no) if test x$enable_experimental = xyes ; then - PKG_CHECK_MOD_VERSION(SPEEX, speex >= 1.2, ac_cv_speex=yes, ac_cv_speex=no) + PKG_CHECK_MOD_VERSION([SPEEX], speex >= 1.2, ac_cv_speex=yes, ac_cv_speex=no) else SPEEX_CFLAGS="" SPEEX_LIBS="" @@ -322,8 +320,8 @@ if test -n "$PKG_CONFIG" ; then # Vorbis versions earlier than 1.2.3 have bugs that cause the libsndfile # test suite to fail on MIPS, PowerPC and others. # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 - PKG_CHECK_MOD_VERSION(VORBIS, vorbis >= 1.2.3, ac_cv_vorbis=yes, ac_cv_vorbis=no) - PKG_CHECK_MOD_VERSION(VORBISENC, vorbisenc >= 1.2.3, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) + PKG_CHECK_MOD_VERSION([VORBIS], vorbis >= 1.2.3, ac_cv_vorbis=yes, ac_cv_vorbis=no) + PKG_CHECK_MOD_VERSION([VORBISENC], vorbisenc >= 1.2.3, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) enable_external_libs=yes fi