From 95828ca2e9ee0c42167ed5fce69286e03df193fd Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 14 Mar 2016 07:18:05 +1100 Subject: [PATCH] Rename `EXTERNAL_*` to EXTERNAL_XIPH_*` New naming makes sense because adding Wavpack support would not depend on any of the existing Xiph.Org libraries. --- Scripts/static-deps-build.mk | 4 ++-- configure.ac | 20 ++++++++++---------- src/Makefile.am | 4 ++-- src/command.c | 12 ++++++------ src/flac.c | 4 ++-- src/ogg.c | 6 +++--- src/ogg_opus.c | 6 +++--- src/ogg_pcm.c | 6 +++--- src/ogg_speex.c | 6 +++--- src/ogg_vorbis.c | 4 ++-- tests/compression_size_test.c | 4 ++-- tests/external_libs_test.c | 8 ++++---- tests/floating_point_test.tpl | 6 +++--- tests/lossy_comp_test.c | 4 ++-- tests/misc_test.c | 4 ++-- tests/ogg_test.c | 4 ++-- tests/string_test.c | 4 ++-- tests/write_read_test.tpl | 2 +- 18 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Scripts/static-deps-build.mk b/Scripts/static-deps-build.mk index cee28988..b9eafcdd 100755 --- a/Scripts/static-deps-build.mk +++ b/Scripts/static-deps-build.mk @@ -88,8 +88,8 @@ configure : configure.ac Build/Stamp/configure : Build/Stamp/install-libs configure PKG_CONFIG_LIBDIR=Build/lib/pkgconfig ./configure - sed -i 's#^EXTERNAL_CFLAGS.*#EXTERNAL_CFLAGS = -I$(pwd)/Build/include#' src/Makefile - sed -i 's#^EXTERNAL_LIBS.*#EXTERNAL_LIBS = -static $(pwd)/Build/lib/libFLAC.la $(pwd)/Build/lib/libogg.la $(pwd)/Build/lib/libvorbis.la $(pwd)/Build/lib/libvorbisenc.la -dynamic #' src/Makefile + sed -i 's#^EXTERNAL_XIPH_CFLAGS.*#EXTERNAL_XIPH_CFLAGS = -I$(pwd)/Build/include#' src/Makefile + sed -i 's#^EXTERNAL_XIPH_LIBS.*#EXTERNAL_XIPH_LIBS = -static $(pwd)/Build/lib/libFLAC.la $(pwd)/Build/lib/libogg.la $(pwd)/Build/lib/libvorbis.la $(pwd)/Build/lib/libvorbisenc.la -dynamic #' src/Makefile make clean touch $@ diff --git a/configure.ac b/configure.ac index 843289aa..47fdc396 100644 --- a/configure.ac +++ b/configure.ac @@ -290,9 +290,9 @@ else #==================================================================================== # Check for Ogg, Vorbis and FLAC. -HAVE_EXTERNAL_LIBS=0 -EXTERNAL_CFLAGS="" -EXTERNAL_LIBS="" +HAVE_EXTERNAL_XIPH_LIBS=0 +EXTERNAL_XIPH_CFLAGS="" +EXTERNAL_XIPH_LIBS="" # Check for pkg-config outside the if statement. PKG_PROG_PKG_CONFIG @@ -325,11 +325,11 @@ if test -n "$PKG_CONFIG" ; then fi if test x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc = "xyesyesyesyes" ; then - HAVE_EXTERNAL_LIBS=1 + HAVE_EXTERNAL_XIPH_LIBS=1 enable_external_libs=yes - EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS" - EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS " + EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS" + EXTERNAL_XIPH_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS " else echo AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]]) @@ -343,7 +343,7 @@ if test -n "$PKG_CONFIG" ; then fi fi -AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_LIBS], $HAVE_EXTERNAL_LIBS, [Will be set to 1 if flac, ogg and vorbis are available.]) +AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], $HAVE_EXTERNAL_XIPH_LIBS, [Will be set to 1 if flac, ogg and vorbis are available.]) #==================================================================================== # Check for libsqlite3 (only used in regtest). @@ -630,14 +630,14 @@ AC_SUBST(SHARED_VERSION_INFO) AC_SUBST(CLEAN_VERSION) AC_SUBST(WIN_RC_VERSION) -AC_SUBST(HAVE_EXTERNAL_LIBS) +AC_SUBST(HAVE_EXTERNAL_XIPH_LIBS) AC_SUBST(OS_SPECIFIC_CFLAGS) AC_SUBST(OS_SPECIFIC_LINKS) AC_SUBST(ALSA_LIBS) AC_SUBST(SNDIO_LIBS) -AC_SUBST(EXTERNAL_CFLAGS) -AC_SUBST(EXTERNAL_LIBS) +AC_SUBST(EXTERNAL_XIPH_CFLAGS) +AC_SUBST(EXTERNAL_XIPH_LIBS) AC_SUBST(SRC_BINDIR) AC_SUBST(TEST_BINDIR) diff --git a/src/Makefile.am b/src/Makefile.am index 0b3b7815..0bba0bab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects -AM_CPPFLAGS = $(EXTERNAL_CFLAGS) +AM_CPPFLAGS = $(EXTERNAL_XIPH_CFLAGS) lib_LTLIBRARIES = libsndfile.la include_HEADERS = sndfile.hh @@ -47,7 +47,7 @@ libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SH libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS) nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS) libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la \ - libcommon.la $(EXTERNAL_LIBS) -lm + libcommon.la $(EXTERNAL_XIPH_LIBS) -lm libcommon_la_SOURCES = $(COMMON) diff --git a/src/command.c b/src/command.c index 963f6eba..3204e562 100644 --- a/src/command.c +++ b/src/command.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2014 Erik de Castro Lopo +** Copyright (C) 2001-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -55,7 +55,7 @@ static SF_FORMAT_INFO const simple_formats [] = "CAF (Apple 16 bit PCM)", "caf" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_FLAC | SF_FORMAT_PCM_16, "FLAC 16 bit", "flac" }, @@ -65,7 +65,7 @@ static SF_FORMAT_INFO const simple_formats [] = "OKI Dialogic VOX ADPCM", "vox" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_OGG | SF_FORMAT_VORBIS, "Ogg Vorbis (Xiph Foundation)", "oga" }, @@ -121,7 +121,7 @@ static SF_FORMAT_INFO const major_formats [] = { SF_FORMAT_AU, "AU (Sun/NeXT)", "au" }, { SF_FORMAT_AVR, "AVR (Audio Visual Research)", "avr" }, { SF_FORMAT_CAF, "CAF (Apple Core Audio File)", "caf" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_FLAC, "FLAC (Free Lossless Audio Codec)", "flac" }, #endif { SF_FORMAT_HTK, "HTK (HMM Tool Kit)", "htk" }, @@ -129,7 +129,7 @@ static SF_FORMAT_INFO const major_formats [] = { SF_FORMAT_MAT4, "MAT4 (GNU Octave 2.0 / Matlab 4.2)", "mat" }, { SF_FORMAT_MAT5, "MAT5 (GNU Octave 2.1 / Matlab 5.0)", "mat" }, { SF_FORMAT_MPC2K, "MPC (Akai MPC 2k)", "mpc" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_OGG, "OGG (OGG Container format)", "oga" }, #endif { SF_FORMAT_PAF, "PAF (Ensoniq PARIS)", "paf" }, @@ -201,7 +201,7 @@ static SF_FORMAT_INFO subtype_formats [] = { SF_FORMAT_DPCM_16, "16 bit DPCM", NULL }, { SF_FORMAT_DPCM_8, "8 bit DPCM", NULL }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_VORBIS, "Vorbis", NULL }, #endif diff --git a/src/flac.c b/src/flac.c index 029e935f..b4c665d3 100644 --- a/src/flac.c +++ b/src/flac.c @@ -29,7 +29,7 @@ #include "sndfile.h" #include "common.h" -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS #include #include @@ -1369,7 +1369,7 @@ flac_byterate (SF_PRIVATE *psf) } /* flac_byterate */ -#else /* HAVE_EXTERNAL_LIBS */ +#else /* HAVE_EXTERNAL_XIPH_LIBS */ int flac_open (SF_PRIVATE *psf) diff --git a/src/ogg.c b/src/ogg.c index 7bc4b31f..fa758506 100644 --- a/src/ogg.c +++ b/src/ogg.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2012 Erik de Castro Lopo +** Copyright (C) 2002-2016 Erik de Castro Lopo ** Copyright (C) 2007 John ffitch ** ** This program is free software ; you can redistribute it and/or modify @@ -34,7 +34,7 @@ #include "sfendian.h" #include "common.h" -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS #include @@ -241,7 +241,7 @@ ogg_page_classify (SF_PRIVATE * psf, const ogg_page * og) return 0 ; } /* ogg_page_classify */ -#else /* HAVE_EXTERNAL_LIBS */ +#else /* HAVE_EXTERNAL_XIPH_LIBS */ int ogg_open (SF_PRIVATE *psf) diff --git a/src/ogg_opus.c b/src/ogg_opus.c index 0824810c..f5769e29 100644 --- a/src/ogg_opus.c +++ b/src/ogg_opus.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2013 Erik de Castro Lopo +** Copyright (C) 2013-2016 Erik de Castro Lopo ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -34,7 +34,7 @@ #include "sfendian.h" #include "common.h" -#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS) +#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS) #include @@ -137,7 +137,7 @@ ogg_opus_close (SF_PRIVATE * UNUSED (psf)) } /* ogg_opus_close */ -#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */ +#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS */ int ogg_opus_open (SF_PRIVATE *psf) diff --git a/src/ogg_pcm.c b/src/ogg_pcm.c index 2e3b7f25..f3cd94c6 100644 --- a/src/ogg_pcm.c +++ b/src/ogg_pcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2012 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -34,7 +34,7 @@ #include "sfendian.h" #include "common.h" -#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS) +#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS) #include @@ -152,7 +152,7 @@ duration = audio_samples / rate = 3.947 */ -#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */ +#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS */ int ogg_pcm_open (SF_PRIVATE *psf) diff --git a/src/ogg_speex.c b/src/ogg_speex.c index f24e242e..b95d4dba 100644 --- a/src/ogg_speex.c +++ b/src/ogg_speex.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2012 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -34,7 +34,7 @@ #include "sfendian.h" #include "common.h" -#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS) +#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS) #include @@ -413,7 +413,7 @@ duration = audio_samples / rate = 3.947 */ -#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */ +#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS */ int ogg_speex_open (SF_PRIVATE *psf) diff --git a/src/ogg_vorbis.c b/src/ogg_vorbis.c index 0597e444..5f1af4fb 100644 --- a/src/ogg_vorbis.c +++ b/src/ogg_vorbis.c @@ -68,7 +68,7 @@ #include "sfendian.h" #include "common.h" -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS #include #include @@ -1166,7 +1166,7 @@ vorbis_length (SF_PRIVATE *psf) return length ; } /* vorbis_length */ -#else /* HAVE_EXTERNAL_LIBS */ +#else /* HAVE_EXTERNAL_XIPH_LIBS */ int ogg_vorbis_open (SF_PRIVATE *psf) diff --git a/tests/compression_size_test.c b/tests/compression_size_test.c index c293852d..85dbd351 100644 --- a/tests/compression_size_test.c +++ b/tests/compression_size_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2015 Erik de Castro Lopo +** Copyright (C) 2007-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -178,7 +178,7 @@ main (int argc, char *argv []) exit (0) ; } ; - if (! HAVE_EXTERNAL_LIBS) + if (! HAVE_EXTERNAL_XIPH_LIBS) { puts (" No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ; return 0 ; } ; diff --git a/tests/external_libs_test.c b/tests/external_libs_test.c index 86b02907..3d3f6525 100644 --- a/tests/external_libs_test.c +++ b/tests/external_libs_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ major_format_test (void) have_ogg = info.format == SF_FORMAT_OGG ? 1 : have_ogg ; } ; - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { exit_if_true (have_flac == 0, "\n\nLine %d : FLAC should be available.\n\n", __LINE__) ; exit_if_true (have_ogg == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; } @@ -88,7 +88,7 @@ subtype_format_test (void) have_vorbis = info.format == SF_FORMAT_VORBIS ? 1 : have_vorbis ; } ; - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) exit_if_true (have_vorbis == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; else exit_if_true (have_vorbis, "\n\nLine %d : Ogg/Vorbis should not be available.\n\n", __LINE__) ; @@ -134,7 +134,7 @@ simple_format_test (void) } ; - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { exit_if_true (have_flac == 0, "\n\nLine %d : FLAC should be available.\n\n", __LINE__) ; exit_if_true (have_ogg == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; exit_if_true (have_vorbis == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; diff --git a/tests/floating_point_test.tpl b/tests/floating_point_test.tpl index e1b20f99..fab0d9ba 100644 --- a/tests/floating_point_test.tpl +++ b/tests/floating_point_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 1999-2015 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -113,7 +113,7 @@ main (int argc, char *argv []) float_scaled_test ("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -153.0) ; float_scaled_test ("alac_20.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, -125.0) ; -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS float_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; float_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; float_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; @@ -170,7 +170,7 @@ main (int argc, char *argv []) double_scaled_test ("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -153.0) ; double_scaled_test ("alac_32.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, -186.0) ; -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS double_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; double_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; double_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; diff --git a/tests/lossy_comp_test.c b/tests/lossy_comp_test.c index c0723737..0d5a8f76 100644 --- a/tests/lossy_comp_test.c +++ b/tests/lossy_comp_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2014 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -376,7 +376,7 @@ main (int argc, char *argv []) } ; if (do_all || strcmp (argv [1], "ogg_vorbis") == 0) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) { /* Don't do lcomp_test_XXX as the errors are too big. */ sdlcomp_test_short ("vorbis.oga", SF_FORMAT_OGG | SF_FORMAT_VORBIS, 1, 0.30) ; sdlcomp_test_int ("vorbis.oga", SF_FORMAT_OGG | SF_FORMAT_VORBIS, 1, 0.30) ; diff --git a/tests/misc_test.c b/tests/misc_test.c index ff45c5d5..90a9d012 100644 --- a/tests/misc_test.c +++ b/tests/misc_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2015 Erik de Castro Lopo +** Copyright (C) 2001-2016 Erik de Castro Lopo ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -226,7 +226,7 @@ zero_data_test (const char *filename, int format) switch (format & SF_FORMAT_TYPEMASK) { case SF_FORMAT_OGG : - if (HAVE_EXTERNAL_LIBS == 0) + if (HAVE_EXTERNAL_XIPH_LIBS == 0) return ; break ; default : diff --git a/tests/ogg_test.c b/tests/ogg_test.c index 4b1be031..78d24b3d 100644 --- a/tests/ogg_test.c +++ b/tests/ogg_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2013 Erik de Castro Lopo +** Copyright (C) 2007-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -328,7 +328,7 @@ ogg_stereo_seek_test (const char * filename, int format) int main (void) { - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { ogg_short_test () ; ogg_int_test () ; ogg_float_test () ; diff --git a/tests/string_test.c b/tests/string_test.c index 5e30caf6..572726f7 100644 --- a/tests/string_test.c +++ b/tests/string_test.c @@ -103,7 +103,7 @@ main (int argc, char *argv []) } ; if (do_all || ! strcmp (argv [1], "flac")) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) string_start_test ("strings.flac", SF_FORMAT_FLAC) ; else puts (" No FLAC tests because FLAC support was not compiled in.") ; @@ -111,7 +111,7 @@ main (int argc, char *argv []) } ; if (do_all || ! strcmp (argv [1], "ogg")) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) string_start_test ("vorbis.oga", SF_FORMAT_OGG) ; else puts (" No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ; diff --git a/tests/write_read_test.tpl b/tests/write_read_test.tpl index 88c2501c..40ba4f48 100644 --- a/tests/write_read_test.tpl +++ b/tests/write_read_test.tpl @@ -366,7 +366,7 @@ main (int argc, char **argv) } ; if (do_all || ! strcmp (argv [1], "flac")) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) { pcm_test_char ("char.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, SF_TRUE) ; pcm_test_short ("short.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_16, SF_TRUE) ; pcm_test_24bit ("24bit.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_24, SF_TRUE) ;