Fixes from Benjamin that correct several "configure" problems under Ubuntu Natty and Debian Unstable

Also fixes test in maketarball.sh that determines whether a reconfig is needed.

configure.in

@@ -24,7 +24,7 @@ dnl automatically choose whether or not to make some libs
 dnl based on:
 dnl
 dnl AC_CHECK_LIB(z, compress2, build_libz=false, build_libz=true)
-dnl AM_CONDITIONAL(BUILD_LIBZ, test $build_libz = true)
+dnl AM_CONDITIONAL(BUILD_LIBZ, test "$build_libz" = true)
 dnl
 dnl
 
@@ -352,26 +352,26 @@ for lib in $LIBRARIES ; do
             break
          fi
       done
-      if test $lib_activated = no ; then
+      if test "$lib_activated" = no ; then
          AC_MSG_NOTICE([disabling $lib])
       fi
    else
       dnl lib_ARGUMENT is something other than "unspecified"
-      if test $LIB_ARGUMENT = local ; then
-         if test $LIB_LOCAL_AVAILABLE = yes ; then
+      if test "$LIB_ARGUMENT" = local ; then
+         if test "$LIB_LOCAL_AVAILABLE" = yes ; then
             eval ${lib}_USE_LOCAL="yes"
             AC_MSG_NOTICE([Using the LOCAL libraries for $lib because you specifically requested this])
          else
             AC_MSG_ERROR([You requested using the local libraries for $lib but they are not available])
          fi
-      elif test $LIB_ARGUMENT = system ; then
-         if test $LIB_SYSTEM_AVAILABLE = yes ; then
+      elif test "$LIB_ARGUMENT" = system ; then
+         if test "$LIB_SYSTEM_AVAILABLE" = yes ; then
             eval ${lib}_USE_SYSTEM="yes"
             AC_MSG_NOTICE([Using the SYSTEM libraries for $lib because you specifically requested this])
          else
             AC_MSG_ERROR([You requested using the system libraries for $lib but they are not available])
          fi
-      elif test $LIB_ARGUMENT = no ; then
+      elif test "$LIB_ARGUMENT" = no ; then
          AC_MSG_NOTICE([disabling $lib at your request])
       else
          AC_MSG_ERROR(I didn't understand the argument $LIB_ARGUMENT for $lib)

lib-src/Makefile.in

@@ -1,8 +1,10 @@
 all: @LOCAL_LIBS@ @LIBSRC_BUILD@
 
 # portSMF
-portSMF:
+portsmf-recursive:
 	$(MAKE) -C portsmf
+libportSMF.a: portsmf-recursive
+	ln -sf portsmf/libportSMF.a libportSMF.a
 
 # dlcompat
 dl-recursive:
@@ -167,7 +169,7 @@ portaudio/pa_mac_core/portaudio.a:
 # Utility rules
 clean:
 	-$(MAKE) -C portsmf clean
-	-$(MAKE) -C dlcompat clean	
+	-$(MAKE) -C dlcompat clean
 	-$(MAKE) -C expat clean
 	-$(MAKE) -C FileDialog clean
 	-$(MAKE) -C libid3tag clean
@@ -218,8 +220,8 @@ distclean:
 	-rm -f @LOCAL_LIBS@
 
 # list here all the targets that aren't actually files to be made
-.PHONY: portSMF eexpat-recursive FileDialog-recursive \
-		widgetextra libogg-recursive \
+.PHONY: portsmf-recursive eexpat-recursive FileDialog-recursive \
+	widgetextra libogg-recursive \
 	libvorbis-recursive libnyquist-recursive libmad-recursive \
 	libid3tag-recursive sbsms-recursive soundtouch-recursive libsndfile-recursive \
 	libresample-recursive libsamplerate-recursive vamp-sdk \

m4/audacity_checklib_libsoundtouch.m4

@@ -31,6 +31,11 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
                      soundtouch_available_system="yes",
                      soundtouch_available_system="no")
    fi
+   if test "x$soundtouch_available_system" = "xno" ; then
+      PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch >= 1.3.0,
+                     soundtouch_available_system="yes",
+                     soundtouch_available_system="no")
+   fi
 
    if test "x$soundtouch_available_system" = "xyes" ; then
       LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes"

m4/audacity_checklib_portsmf.m4

@@ -0,0 +1,54 @@
+dnl Add Audacity / portSMF license?
+dnl
+dnl Please increment the serial number below whenever you alter this macro
+dnl for the benefit of automatic macro update systems
+# audacity_checklib_portsmf.m4 serial 1
+
+AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+
+   AC_ARG_WITH(midi,
+               [AS_HELP_STRING([--with-midi],
+                               [use portSMF for Midi support])],
+               PORTSMF_ARGUMENT=$withval,
+               PORTSMF_ARGUMENT="unspecified")
+
+   if false ; then
+      AC_DEFINE(USE_MIDI, 1,
+                [Define if midi support should be enabled])
+   fi
+
+   dnl see if libportsmf is installed on the system
+
+   PKG_CHECK_MODULES(PORTSMF, portSMF,
+                     portsmf_available_system="yes",
+                     portsmf_available_system="no")
+
+   if test "x$portsmf_available_system" = "xyes" ; then
+      PORTSMF_SYSTEM_AVAILABLE="yes"
+      PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
+      PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS"
+      PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
+      dnl extra objects we can now compile
+      PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+      AC_MSG_NOTICE([portSMF library is available as system library])
+   else
+      PORTSMF_SYSTEM_AVAILABLE="no"
+      AC_MSG_NOTICE([portSMF library is NOT available as system library])
+   fi
+
+   AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+                 allegro_h_available="yes",
+                 allegro_h_available="no")
+
+   if test "x$allegro_h_available" = "xyes" ; then
+      PORTSMF_LOCAL_AVAILABLE="yes"
+      PORTSMF_LOCAL_LIBS="libportSMF.a"
+      PORTSMF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portsmf'
+      PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
+      PORTSMF_LOCAL_CONFIG_SUBDIRS="lib-src/portsmf"
+      dnl extra objects we can now compile
+      PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+   else
+      PORTSMF_LOCAL_AVAILABLE="no"
+   fi
+])

m4/audacity_checklib_widgetextra.m4

@@ -35,42 +35,3 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
    dnl otherwise good - got it. Flags will be available for use in
    dnl WIDGETEXTRA_LIBS and friends
 ])
-
-AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
-
-   AC_ARG_WITH(midi,
-               [AS_HELP_STRING([--with-midi],
-                               [use portSMF for Midi support ])],
-               PORTSMF_ARGUMENT=$withval,
-               PORTSMF_ARGUMENT="unspecified")
-   if false ; then
-      AC_DEFINE(USE_MIDI, 1,
-                [Define if midi support should be enabled])
-   fi
-
-   dnl we need to configure portSMF if there is a local copy
-   if test -d ${srcdir}/lib-src/portsmf ; then
-      AX_CONFIG_DIR(["${srcdir}/lib-src/portsmf"])
-   fi
-   dnl having done that we get a pkg-config file we can use
-   dnl add the directory with portSMF in to the pkg-config search path
-   PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
-   export PKG_CONFIG_PATH
-   PKG_CHECK_MODULES(PORTSMF, portSMF,
-                     portsmf_available="yes",
-                     portsmf_available="no")
-
-   if test "x$portsmf_available" = "xyes" ; then
-      PORTSMF_LOCAL_AVAILABLE="yes"
-      PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
-      PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
-      PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
-	  dnl extra objects we can now compile
-      PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
-	  dnl this bit makes sure that we compile the lib-src copy
-	  PORTSMF_LOCAL_BUILD="portSMF"
-   else
-	  PORTSMF_LOCAL_AVAILABLE="no"
-   fi
-])
-

scripts/maketarball.sh

@@ -306,13 +306,13 @@ if [[ x"$reconf" = x1 ]] ; then
 	echo "Your Makefiles are out of date or missing. (Re)running configure to"
 	echo "create up-to-date Makefiles before building tarballs..."
 	echo "   ./configure ${configargs}"
-fi
 
-# if we are in silent mode, then redirect the output of configure
-if [ $mode -eq 1 ]; then
-	$SHELL -c "./configure ${configargs}"
-else
-	$SHELL -c "./configure ${configargs}" > /dev/null 2>&1
+   # if we are in silent mode, then redirect the output of configure
+   if [ $mode -eq 1 ]; then
+      $SHELL -c "./configure ${configargs}"
+   else
+      $SHELL -c "./configure ${configargs}" > /dev/null 2>&1
+   fi
 fi
 
 # The version number is stored in a C++ header as a set of #defines. Trying to