shithub: libsamplerate

Download patch

ref: 639206d1826ae6bcb26aa66b26165f53a1c81d8d
parent: 2b47801e363e9bebd270243c433076fcb691fcce
author: Erik de Castro Lopo <erikd@miles>
date: Sat Dec 4 02:50:38 EST 2004 

Ditch detection/use of libefence.


--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-04  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
+
+    * configure.ac tests/Makefile.am tests/*.c
+    Ditch detection and use of libefence. Valgrind is a far better debugging
+    tool.
+
+    * INSTALL
+    Write complete libsamplerate specific install instructions.
+
 2004-10-06  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * src/configure.ac src/makefile.am
--- a/configure.ac
+++ b/configure.ac
@@ -92,24 +92,6 @@
 AC_CHECK_SIZEOF(double,8)
 
 #====================================================================================
-# Want to find libefence if it exists, but only want to link it to the test
-# programs. Therefore, save $LIBS, check for libefence and then reset $LIBS
-# to the previously saved value.
-
-ac_cv_lib_efence_memalign=no
-EFENCE_LIB=""
-
-if test x$ac_arg_debug = xyes ; then
-	saved_LIBS=$LIBS
-	AC_CHECK_LIB([efence],memalign)
-	LIBS=$saved_LIBS
-
-	if test x$ac_cv_lib_efence_memalign = xyes ; then
-		EFENCE_LIB="-lefence"
-		fi
-	fi
-
-#====================================================================================
 # Check for functions.
 
 AC_CHECK_FUNCS(malloc calloc free memcpy memmove)
@@ -260,8 +242,6 @@
 AC_SUBST(FFTW3_CFLAGS)
 AC_SUBST(FFTW3_LIBS)
 
-AC_SUBST(EFENCE_LIB)
-
 AC_SUBST(HAVE_SNDFILE)
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
@@ -294,8 +274,7 @@
 
     Use FFTW : .................... ${ac_cv_fftw3}])
 
-AC_MSG_RESULT([    Have libsndfile : ............. ${ac_cv_sndfile}])
-AC_MSG_RESULT([    Have libefence : .............. ${ac_cv_lib_efence_memalign}
+AC_MSG_RESULT([    Have libsndfile : ............. ${ac_cv_sndfile}
 ])
 
 AC_MSG_RESULT([  Installation directories :
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,31 +9,31 @@
 #===============================================================================
 
 misc_test_SOURCES = misc_test.c util.c util.h
-misc_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+misc_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 termination_test_SOURCES = termination_test.c util.c util.h
-termination_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+termination_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 simple_test_SOURCES = simple_test.c util.c util.h
-simple_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+simple_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 reset_test_SOURCES = reset_test.c util.c util.h
-reset_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+reset_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 multi_channel_test_SOURCES = multi_channel_test.c util.c calc_snr.c
 multi_channel_test_CFLAGS = @FFTW3_CFLAGS@
-multi_channel_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS) $(EFENCE_LIB)
+multi_channel_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
 
 snr_bw_test_SOURCES = snr_bw_test.c calc_snr.c util.c util.h
 snr_bw_test_CFLAGS = @FFTW3_CFLAGS@
-snr_bw_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS) $(EFENCE_LIB)
+snr_bw_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
 
 callback_test_SOURCES = callback_test.c util.c util.h
 callback_test_CFLAGS = @FFTW3_CFLAGS@
-callback_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+callback_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 float_short_test_SOURCES = float_short_test.c util.c util.h
-float_short_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(EFENCE_LIB)
+float_short_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
 
 # This program is for evaluating other sample rate converters.
 
--- a/tests/callback_test.c
+++ b/tests/callback_test.c
@@ -38,9 +38,6 @@
 
 	int k ;
 
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("") ;
 
 	puts ("    Zero Order Hold interpolator :") ;
--- a/tests/float_short_test.c
+++ b/tests/float_short_test.c
@@ -33,9 +33,6 @@
 int
 main (void)
 {
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("") ;
 
 	float_to_short_test () ;
--- a/tests/misc_test.c
+++ b/tests/misc_test.c
@@ -31,9 +31,6 @@
 int
 main (void)
 {
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("") ;
 
 	printf ("    version : %s\n\n", src_get_version ()) ;
--- a/tests/multi_channel_test.c
+++ b/tests/multi_channel_test.c
@@ -37,9 +37,6 @@
 int
 main (void)
 {
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("\n    Zero Order Hold interpolator :") ;
 	simple_test		(SRC_ZERO_ORDER_HOLD, 1, 45.0) ;
 	process_test	(SRC_ZERO_ORDER_HOLD, 1, 45.0) ;
--- a/tests/reset_test.c
+++ b/tests/reset_test.c
@@ -35,9 +35,7 @@
 
 int
 main (void)
-{	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
+{
 	puts ("") ;
 
 	process_reset_test (SRC_ZERO_ORDER_HOLD) ;
--- a/tests/simple_test.c
+++ b/tests/simple_test.c
@@ -37,9 +37,6 @@
 
 	int k ;
 
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("") ;
 
 	puts ("    Zero Order Hold interpolator :") ;
--- a/tests/snr_bw_test.c
+++ b/tests/snr_bw_test.c
@@ -149,9 +149,6 @@
 	double	best_snr, snr, freq3dB, conversion_rate, worst_conv_rate ;
 	int 	j, k, converter, verbose = 0 ;
 
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	if (argc == 2 && strcmp (argv [1], "--verbose") == 0)
 		verbose = 1 ;
 
--- a/tests/termination_test.c
+++ b/tests/termination_test.c
@@ -41,9 +41,6 @@
 
 	int k ;
 
-	/* Force output of the Electric Fence banner message. */
-	force_efence_banner () ;
-
 	puts ("\n    Zero Order Hold interpolator:") ;
 
 	for (k = 0 ; k < ARRAY_LEN (src_ratios) ; k++)
--- a/tests/util.c
+++ b/tests/util.c
@@ -146,14 +146,6 @@
 	return ;
 } /* deinterleave_data */
 
-void
-force_efence_banner (void)
-{	void *dummy ;
-
-	dummy = malloc (1) ;
-	free (dummy) ;
-} /* force_efence_banner */
-
 /*
 ** Do not edit or modify anything in this comment block.
 ** The arch-tag line is a file identity tag for the GNU Arch 
--- a/tests/util.h
+++ b/tests/util.h
@@ -27,8 +27,6 @@
 void save_oct_float (char *filename, float *input, int in_len, float *output, int out_len) ;
 void save_oct_double (char *filename, double *input, int in_len, double *output, int out_len) ;
 
-void force_efence_banner (void) ;
-
 void interleave_data (const float *in, float *out, int frames, int channels) ;
 
 void deinterleave_data (const float *in, float *out, int frames, int channels) ;