mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-26 14:18:38 -05:00
- Add in code to look for portaudio v19 beta as a subdir, if found
compile it if necessary and use the libs from it instead of the system library. v19 has a different ABI than portaudio normally installed on unix systems. I have come across at least one other program that includes a copy of portaudio v19 with it's release package due to this problem. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@184 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
bbf2bc9208
commit
680a9194c9
@ -268,7 +268,7 @@ can now be compiled in Windows as follows:
|
||||
|
||||
In Linux or FreeBSD, do the following:
|
||||
|
||||
$ ./configure --enable-portaudio (or --enable-alsa)
|
||||
$ ./configure --enable-portaudio (or --enable-alsa or --enable-oss)
|
||||
$ make
|
||||
|
||||
|
||||
|
16
configure.ac
16
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="-I/usr/local/include -I/usr/include/alsa ${CPPFLAGS}"
|
||||
CPPFLAGS="-Iportaudio/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,13 @@ 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])
|
||||
AC_CHECK_HEADER([portaudio.h], [HAS_PORTAUDIO_H=1], [HAS_PORTAUDIO_H=0])
|
||||
if test -e "./portaudio/pa_common/portaudio.h" ; then
|
||||
echo "Checking for portaudio...yes"
|
||||
HAS_PORTAUDIO_H=1
|
||||
else
|
||||
echo "Checking for portaudio...no"
|
||||
HAS_SAMPLERATE_H=0
|
||||
fi
|
||||
AC_CHECK_HEADER([samplerate.h], [HAS_SAMPLERATE_H=1], [HAS_SAMPLERATE_H=0])
|
||||
|
||||
dnl See whether we can include both string.h and strings.h.
|
||||
@ -331,7 +337,11 @@ 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")
|
||||
LDFLAGS="${LDFLAGS} -lportaudio -lsamplerate"
|
||||
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"
|
||||
fi
|
||||
|
||||
if test "$jack" = yes; then
|
||||
|
Loading…
Reference in New Issue
Block a user