FFT package selection

Zmoelnig's multi-'$' patch

big-soundfile support

Patch to set open directories (openpanel, savepanel)

patch to allow funny characters in extern names

fixed makefile.in to support intel mac

svn path=/trunk/; revision=5164

1 files changed, 28 insertions, 31 deletions

diff --git a/pd/src/configure.in b/pd/src/configure.in
index 5e43a990..6656f493 100644
--- a/pd/src/configure.in
+++ b/pd/src/configure.in
@@ -6,6 +6,7 @@ AC_SUBST(jack, no)
 AC_SUBST(portaudio, no)
 AC_SUBST(portmidi, no)
 AC_SUBST(binarymode, -m755)
+AC_SUBST(fftw, no)
 AC_SUBST(PDLIB)
 AC_SUBST(MORECFLAGS)
 AC_SUBST(EXT)
@@ -38,7 +39,9 @@ AC_ARG_ENABLE(static,   [  --enable-static         link statically],
     static=$enableval)
 AC_ARG_ENABLE(setuid,   [  --enable-setuid         install as setuid (linux)],
     setuid=$enableval)
-    
+AC_ARG_ENABLE(fftw,   [  --enable-fftw           use FFTW package],
+    fftw=$enableval)
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -79,6 +82,13 @@ dnl Checking for `pthread_create' function in -pthread
 AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread",
          echo "pthreads required" || exit 1)
 
+dnl Check for fftw package
+if test x$fftw == "xyes";
+then
+AC_CHECK_LIB(fftw, fftw_one,PDLIB="$PDLIB -lfftw",
+    echo "fftw package not found - using built-in FFT"; fftw=no)
+fi
+
 dnl look for tcl 8.x... do I really have to go through all this!?
 
 foundit=no
@@ -161,7 +171,7 @@ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
       LDFLAGS="$LDFLAGS -static"
     fi 
     EXT=pd_linux
-    MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD\
+    MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD\
     	 -DUSEAPI_OSS \
         -I../portaudio/pa_common -I../portaudio/pablio \
         -I../portmidi/pm_common \
@@ -213,17 +223,7 @@ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
 	OPT_CFLAGS="-g"
     else
 	OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-
-    if test x$jack == "xyes";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
     fi
-    if test x$jack == "xrun";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
-    fi
-    fi
-
     if test x$jack == "xyes";
     then
         LDFLAGS=$LDFLAGS" -lrt -ljack"
@@ -232,26 +232,10 @@ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
     then
         LDFLAGS=$LDFLAGS" -lrt -ljack"
     fi
+
     echo OPT_CFLAGS --------------- $OPT_CFLAGS
     OSNUMBER=0
 
-    if test x$jack == "xyes";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
-    fi
-    if test x$jack == "xrun";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
-    fi
-    fi
-
-    if test x$jack == "xyes";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
-    fi
-    if test x$jack == "xrun";
-    then
-        LDFLAGS=$LDFLAGS" -lrt -ljack"
 fi
 
 if test `uname -s` = Darwin;
@@ -265,7 +249,7 @@ then
 	-I../portmidi/pm_common -I../portmidi/pm_mac \
 	-I../portmidi/porttime \
 	-Wno-error \
-	-DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO"
+	-DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO"
     SYSSRC="s_midi_pm.c s_audio_pa.c \
     	s_audio_pablio.c     \
 	s_audio_paring.c     \
@@ -313,7 +297,12 @@ then
 	OPT_CFLAGS="-O2"
     fi
     OSNUMBER=2
-    EXTERNTARGET=pd_darwin
+    if test `uname -m`  = i386;
+    then
+    	EXTERNTARGET=pd_imac
+    else
+    	EXTERNTARGET=pd_darwin
+    fi
     if test x$jack == "xyes";
     then
     	LDFLAGS=$LDFLAGS" -weak_framework Jack"
@@ -337,6 +326,14 @@ then
     SYSSRC=$SYSSRC" s_audio_jack.c"
 fi
 
+if test x$fftw == "xyes";
+then
+    SYSSRC=$SYSSRC" d_fft_fftw.c d_fftroutine.c"
+    LDFLAGS=$LDFLAGS" -lfftw"
+else
+    SYSSRC=$SYSSRC" d_fft_mayer.c d_fftroutine.c"
+fi
+
 # extra flags for alpha machines
 if test `uname -m | awk '{print $1}'` = alpha;
 then