diff --git a/configure b/configure index d3e66595d..f9c47fc8c 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 184 2006-07-05 03:03:11Z va3db $ +# $Id: configure.ac 185 2006-07-05 03:49:02Z va3db $ # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -977,7 +977,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 184 2006-07-05 03:03:11Z va3db $ +$Id: configure.ac 185 2006-07-05 03:49:02Z va3db $ _ACEOF exit 0 fi @@ -2501,7 +2501,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CFLAGS="$OLD_CFLAGS" -CPPFLAGS="-Iportaudio/pa_common -I/usr/local/include -I/usr/include/alsa ${CPPFLAGS}" +CPPFLAGS="-Iportaudio-v19/pa_common -I/usr/local/include -I/usr/include/alsa ${CPPFLAGS}" LDFLAGS="-L/usr/local/lib -lpthread ${LDFLAGS}" echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5 @@ -4615,7 +4615,7 @@ else fi -if test -e "./portaudio/pa_common/portaudio.h" ; then +if test -e "portaudio-v19/pa_common/portaudio.h" ; then echo "Checking for portaudio...yes" HAS_PORTAUDIO_H=1 else @@ -6749,11 +6749,7 @@ _ACEOF AUDIO="a2d.f90 jtaudio.c start_portaudio.c" - if test ! -e "portaudio/lib/libportaudio.a" ; then - echo "Building portaudio" - (cd portaudio; ./configure --with-jack=no;make) - fi - LDFLAGS="./portaudio/lib/libportaudio.a ${LDFLAGS} -lsamplerate" + LDFLAGS="-Lportaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate" fi if test "$jack" = yes; then diff --git a/configure.ac b/configure.ac index 24f7e5a79..a83829d62 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl Make sure autoconf doesn't interfere with cflags -jmallett CFLAGS="$OLD_CFLAGS" dnl Lets guess at some likely places for extra libs/includes XXX -db -CPPFLAGS="-Iportaudio/pa_common -I/usr/local/include -I/usr/include/alsa ${CPPFLAGS}" +CPPFLAGS="-Iportaudio-v19/pa_common -I/usr/local/include -I/usr/include/alsa ${CPPFLAGS}" LDFLAGS="-L/usr/local/lib -lpthread ${LDFLAGS}" AC_MSG_CHECKING([uname -s for Cygwin, Solaris or HPUX]) @@ -111,7 +111,7 @@ AC_HEADER_TIME AC_CHECK_HEADER([sys/soundcard.h], [HAS_SOUNDCARD_H=1], [HAS_SOUNDCARD_H=0]) AC_CHECK_HEADER([alsa/asoundlib.h], [HAS_ASOUNDLIB_H=1], [HAS_ASOUNDLIB_H=0]) AC_CHECK_HEADER([jack/jack.h], [HAS_JACK_H=1], [HAS_JACK_H=0]) -if test -e "./portaudio/pa_common/portaudio.h" ; then +if test -e "portaudio-v19/pa_common/portaudio.h" ; then echo "Checking for portaudio...yes" HAS_PORTAUDIO_H=1 else @@ -314,11 +314,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") - if test ! -e "portaudio/lib/libportaudio.a" ; then - echo "Building portaudio" - (cd portaudio; ./configure --with-jack=no;make) - fi - LDFLAGS="./portaudio/lib/libportaudio.a ${LDFLAGS} -lsamplerate" + LDFLAGS="-Lportaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate" fi if test "$jack" = yes; then