diff --git a/configure b/configure index c476c69e9..9dd56fd94 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for wsjt 5.9.2. # -# $Id: configure.ac 226 2006-08-02 03:47:38Z va3db $ +# $Id: configure.ac 227 2006-08-02 10:12:59Z va3db $ # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -976,7 +976,7 @@ Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -$Id: configure.ac 226 2006-08-02 03:47:38Z va3db $ +$Id: configure.ac 227 2006-08-02 10:12:59Z va3db $ _ACEOF exit 0 fi @@ -6737,7 +6737,7 @@ cat >>confdefs.h <<\_ACEOF #define USE_PORTAUDIO 1 _ACEOF - AUDIO="a2d.f90 jtaudio.c start_portaudio.c" + AUDIO="a2d.f90 jtaudio.c resample.c start_portaudio.c" NEEDPORTAUDIO="portaudio-v19/lib/libportaudio.a" diff --git a/configure.ac b/configure.ac index d021f3a8d..c7ea666ec 100644 --- a/configure.ac +++ b/configure.ac @@ -305,7 +305,7 @@ fi if test "$portaudio" = yes; then AC_DEFINE(USE_PORTAUDIO, 1, [Define if you want PORTAUDIO used.]) - AC_SUBST(AUDIO, "a2d.f90 jtaudio.c start_portaudio.c") + AC_SUBST(AUDIO, "a2d.f90 jtaudio.c resample.c start_portaudio.c") AC_SUBST(NEEDPORTAUDIO, "portaudio-v19/lib/libportaudio.a") LDFLAGS="portaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate" else diff --git a/portaudio-v19/config.log b/portaudio-v19/config.log index 7b24b68d9..8f29e67d0 100644 --- a/portaudio-v19/config.log +++ b/portaudio-v19/config.log @@ -14,6 +14,9 @@ configure:991: checking whether byte ordering is bigendian configure:1083: checking for snd_pcm_open in -lasound configure:1131: checking host system type configure:1159: checking for pkg-config +configure:1203: checking for jack +configure:1210: checking JACK_CFLAGS +configure:1215: checking JACK_LIBS configure:1244: checking size of short configure:1283: checking size of int configure:1322: checking size of long diff --git a/portaudio-v19/config.status b/portaudio-v19/config.status index d06450081..d2b8f073e 100755 --- a/portaudio-v19/config.status +++ b/portaudio-v19/config.status @@ -2,7 +2,7 @@ # Generated automatically by configure. # Run this file to recreate the current configuration. # This directory was configured as follows, -# on host phy-joe.Princeton.EDU: +# on host night.db.net: # # ./configure --with-jack=no # @@ -64,14 +64,14 @@ s%@INSTALL_PROGRAM@%${INSTALL}%g s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g s%@INSTALL_DATA@%${INSTALL} -m 644%g s%@AR@%/usr/bin/ar%g -s%@host@%i686-pc-linux-gnu%g -s%@host_alias@%i686-pc-linux-gnu%g -s%@host_cpu@%i686%g -s%@host_vendor@%pc%g -s%@host_os@%linux-gnu%g +s%@host@%i386-unknown-freebsd7.0%g +s%@host_alias@%i386-unknown-freebsd7.0%g +s%@host_cpu@%i386%g +s%@host_vendor@%unknown%g +s%@host_os@%freebsd7.0%g s%@PKG_CONFIG@%/usr/local/bin/pkg-config%g -s%@JACK_CFLAGS@%%g -s%@JACK_LIBS@%%g +s%@JACK_CFLAGS@%-I/usr/local/include %g +s%@JACK_LIBS@%-pthread -L/usr/local/lib -ljack %g s%@OTHER_OBJS@% pa_unix_oss/pa_unix_oss.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o%g s%@PADLL@%libportaudio.so%g s%@SHARED_FLAGS@%-shared -fPIC%g diff --git a/wsjt1.F b/wsjt1.F index 05c0e62bd..b0e32d499 100644 --- a/wsjt1.F +++ b/wsjt1.F @@ -105,7 +105,7 @@ dat2(j)=dat(j)-ave enddo -#ifdef Win32 +#if (USE_PORTAUDIO==1) || defined(Win32) ierr=resample(dat2,dat,samratio,jz) if(ierr.ne.0) print*,'Resample error.',samratio #endif