[Freeswitch-svn] [commit] r9319 - freeswitch/trunk/libs/libresample

[Freeswitch SVN]

Author: brian
Date: Mon Aug 18 12:53:31 2008
New Revision: 9319

Modified:
   freeswitch/trunk/libs/libresample/Makefile.am
   freeswitch/trunk/libs/libresample/configure.in

Log:
don't build the tests that use libsndfile and libsamplerate (FSBUILD-67) 

Modified: freeswitch/trunk/libs/libresample/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/libresample/Makefile.am	(original)
+++ freeswitch/trunk/libs/libresample/Makefile.am	Mon Aug 18 12:53:31 2008
@@ -20,16 +20,16 @@
 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

Modified: freeswitch/trunk/libs/libresample/configure.in
==============================================================================
--- freeswitch/trunk/libs/libresample/configure.in	(original)
+++ freeswitch/trunk/libs/libresample/configure.in	Mon Aug 18 12:53:31 2008
@@ -128,13 +128,13 @@
 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 @@
 
 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/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/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
 
 echo "Type 'configure --help' to see options."
 echo ""