Audacity

Update of /cvsroot/audacity/lib-src/libresample
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21733

Modified Files:
	Makefile.in configure configure.in 
Log Message:
Patch build system a little to disable tests by default, and avoid rebuilding
when no source changes have happened.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/libresample/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in	14 Mar 2004 01:22:10 -0000	1.4
+++ Makefile.in	29 Aug 2007 19:42:33 -0000	1.5
@@ -26,17 +26,17 @@
 	$(AR) ruv libresample.a $(OBJS)
 	ranlib libresample.a
 
-tests/testresample: libresample.a $(srcdir)/tests/testresample.c $(DIRS)
+tests/testresample: libresample.a $(srcdir)/tests/testresample.c
 	$(CC) -o tests/testresample \
 		$(CFLAGS) $(srcdir)/tests/testresample.c \
 		libresample.a $(LIBS)
 
-tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c $(DIRS)
+tests/compareresample: libresample.a $(srcdir)/tests/compareresample.c 
 	$(CC) -o tests/compareresample \
 		$(CFLAGS) $(srcdir)/tests/compareresample.c \
 		libresample.a -lsamplerate $(LIBS)
 
-tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c $(DIRS)
+tests/resample-sndfile: libresample.a $(srcdir)/tests/resample-sndfile.c
 	$(CC) -o tests/resample-sndfile \
 		$(CFLAGS) $(srcdir)/tests/resample-sndfile.c \
 		libresample.a -lsndfile $(LIBS)

Index: configure
===================================================================
RCS file: /cvsroot/audacity/lib-src/libresample/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure	9 Feb 2004 02:22:54 -0000	1.2
+++ configure	29 Aug 2007 19:42:33 -0000	1.3
@@ -1,25 +1,54 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
[...6031 lines suppressed...]
 	echo ""
+	fi
 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
+else if [ x$test_arg = x"yes" ] ; then
 	echo "Could not find libsamplerate - only needed if you want to"
 	echo "compile tests/compareresample to compare their performance."
 	echo ""
+	fi
 fi
 
 echo "Type 'configure --help' to see options."
 echo ""
-echo "Type 'make' to build libresample and tests."
+echo "Type 'make' to build libresample."

Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/libresample/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	9 Feb 2004 02:43:12 -0000	1.3
+++ configure.in	29 Aug 2007 19:42:33 -0000	1.4
@@ -13,6 +13,7 @@
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_RANLIB
 
 AC_PATH_PROG(AR, ar, no)
@@ -23,20 +24,28 @@
 AC_SUBST(TARGETS)
 TARGETS="libresample.a tests/testresample"
 
-AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no)
-AC_CHECK_HEADER(sndfile.h, , have_libsndfile=no)
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable tests using libsndfile and libsamplerate]), test_arg="yes", test_arg="no")
 
-if [[ $have_libsndfile = "yes" ]] ; then
-	TARGETS="$TARGETS tests/resample-sndfile"
-fi
+if [[ x$test_arg = "xyes" ]] ; then
+	AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no)
+	AC_CHECK_HEADER(sndfile.h, , have_libsndfile=no)
 
-AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no)
-AC_CHECK_HEADER(samplerate.h, , have_libsamplerate=no)
+	if [[ $have_libsndfile = "yes" ]] ; then
+		TARGETS="$TARGETS tests/resample-sndfile"
+	fi
+	
+	AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no)
+	AC_CHECK_HEADER(samplerate.h, , have_libsamplerate=no)
 
-if [[ $have_libsamplerate = "yes" ]] ; then
-	TARGETS="$TARGETS tests/compareresample"
+	if [[ $have_libsamplerate = "yes" ]] ; then
+		TARGETS="$TARGETS tests/compareresample"
+	fi
+else
+	have_libsamplerate="no"
+	have_libsndfile="no"
 fi
 
+
 AC_CHECK_HEADERS(inttypes.h)
 
 AC_CONFIG_HEADER(src/config.h:src/configtemplate.h)
@@ -47,22 +56,24 @@
 if [[ $have_libsamplerate = "yes" ]] ; then
 	echo "Configured to build tests/resample-sndfile using libsndfile"
 	echo ""
-else
+else if [[ x$test_arg = x"yes" ]] ; then
 	echo "Could not find libsndfile - needed if you want to"
 	echo "compile tests/resample-sndfile"
 	echo ""
+	fi
 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
+else if [[ x$test_arg = x"yes" ]] ; then
 	echo "Could not find libsamplerate - only needed if you want to"
 	echo "compile tests/compareresample to compare their performance."
 	echo ""
+	fi
 fi
 
 echo "Type 'configure --help' to see options."
 echo ""
-echo "Type 'make' to build libresample and tests."
+echo "Type 'make' to build libresample."