From e24f6b6f397a0492817b1ce330ab1cd575472904 Mon Sep 17 00:00:00 2001 From: Brian West Date: Mon, 18 Aug 2008 16:53:31 +0000 Subject: [PATCH] don't build the tests that use libsndfile and libsamplerate (FSBUILD-67) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9319 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/libresample/Makefile.am | 24 ++++++++++---------- libs/libresample/configure.in | 42 +++++++++++++++++------------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libs/libresample/Makefile.am b/libs/libresample/Makefile.am index 0ee5e92dc4..fc6f151b85 100644 --- a/libs/libresample/Makefile.am +++ b/libs/libresample/Makefile.am @@ -20,16 +20,16 @@ testresample_SOURCES = tests/testresample.c testresample_CFLAGS = $(AM_CFLAGS) testresample_LDADD = ${top_builddir}/libresample.la -if SAMPLE -bin_PROGRAMS += compareresample -compareresample_SOURCES = tests/compareresample.c -compareresample_CFLAGS = $(AM_CFLAGS) -compareresample_LDADD = ${top_builddir}/libresample.la -lsamplerate -endif +#if SAMPLE +#bin_PROGRAMS += compareresample +#compareresample_SOURCES = tests/compareresample.c +#compareresample_CFLAGS = $(AM_CFLAGS) +#compareresample_LDADD = ${top_builddir}/libresample.la -lsamplerate +#endif -if SNDFILE -bin_PROGRAMS += resample_sndfile -resample_sndfile_SOURCES = tests/resample-sndfile.c -resample_sndfile_CFLAGS = $(AM_CFLAGS) -resample_sndfile_LDADD = ${top_builddir}/libresample.la -lsndfile -endif +#if SNDFILE +#bin_PROGRAMS += resample_sndfile +#resample_sndfile_SOURCES = tests/resample-sndfile.c +#resample_sndfile_CFLAGS = $(AM_CFLAGS) +#resample_sndfile_LDADD = ${top_builddir}/libresample.la -lsndfile +#endif diff --git a/libs/libresample/configure.in b/libs/libresample/configure.in index 66e8e1eb16..daeaa3fbf7 100644 --- a/libs/libresample/configure.in +++ b/libs/libresample/configure.in @@ -128,13 +128,13 @@ AC_SUBST(DYNAMIC_LIB_EXTEN) AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[sunpro is bad at inline]) -AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no) +#AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no) -AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no) +#AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no) -AM_CONDITIONAL([SAMPLE], [test $have_libsamplerate = "yes"]) -AM_CONDITIONAL([SNDFILE],[test $have_libsndfile = "yes"]) +#AM_CONDITIONAL([SAMPLE], [test $have_libsamplerate = "yes"]) +#AM_CONDITIONAL([SNDFILE],[test $have_libsndfile = "yes"]) AC_CHECK_HEADERS(inttypes.h) @@ -144,24 +144,24 @@ AC_OUTPUT([Makefile]) echo "" -if [[ $have_libsamplerate = "yes" ]] ; then - echo "Configured to build tests/resample-sndfile using libsndfile" - echo "" -else - echo "Could not find libsndfile - needed if you want to" - echo "compile tests/resample-sndfile" - echo "" -fi +#if [[ $have_libsamplerate = "yes" ]] ; then +# echo "Configured to build tests/resample-sndfile using libsndfile" +# echo "" +#else +# echo "Could not find libsndfile - needed if you want to" +# echo "compile tests/resample-sndfile" +# echo "" +#fi -if [[ $have_libsamplerate = "yes" ]] ; then - echo "Configured to build tests/compareresample to compare against" - echo "Erik de Castro Lopo's libsamplerate library." - echo "" -else - echo "Could not find libsamplerate - only needed if you want to" - echo "compile tests/compareresample to compare their performance." - echo "" -fi +#if [[ $have_libsamplerate = "yes" ]] ; then +# echo "Configured to build tests/compareresample to compare against" +# echo "Erik de Castro Lopo's libsamplerate library." +# echo "" +#else +# echo "Could not find libsamplerate - only needed if you want to" +# echo "compile tests/compareresample to compare their performance." +# echo "" +#fi echo "Type 'configure --help' to see options." echo ""