w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

- move portaudio to portaudio-v19, note portaudio-v19 itself still

Browse Source 
has to be imported.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@187 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Diane Bruce 2006-07-05 15:32:17 +00:00
parent 70d2c2b1a8
commit 42349ec587
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wsjt 5.9.2. # 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. # Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation # 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 This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. 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 _ACEOF
exit 0 exit 0
fi fi
@ -2501,7 +2501,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CFLAGS="$OLD_CFLAGS" 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}" LDFLAGS="-L/usr/local/lib -lpthread ${LDFLAGS}"
echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5 echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5
@ -4615,7 +4615,7 @@ else
fi 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" echo "Checking for portaudio...yes"
HAS_PORTAUDIO_H=1 HAS_PORTAUDIO_H=1
else else
@ -6749,11 +6749,7 @@ _ACEOF
AUDIO="a2d.f90 jtaudio.c start_portaudio.c" AUDIO="a2d.f90 jtaudio.c start_portaudio.c"
if test ! -e "portaudio/lib/libportaudio.a" ; then LDFLAGS="-Lportaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate"
echo "Building portaudio"
(cd portaudio; ./configure --with-jack=no;make)
fi
LDFLAGS="./portaudio/lib/libportaudio.a ${LDFLAGS} -lsamplerate"
fi fi
if test "$jack" = yes; then if test "$jack" = yes; then

10
configure.ac
View File

@ -21,7 +21,7 @@ dnl Make sure autoconf doesn't interfere with cflags -jmallett
CFLAGS="$OLD_CFLAGS" CFLAGS="$OLD_CFLAGS"
dnl Lets guess at some likely places for extra libs/includes XXX -db 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}" LDFLAGS="-L/usr/local/lib -lpthread ${LDFLAGS}"
AC_MSG_CHECKING([uname -s for Cygwin, Solaris or HPUX]) 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([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([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([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" echo "Checking for portaudio...yes"
HAS_PORTAUDIO_H=1 HAS_PORTAUDIO_H=1
else else
@ -314,11 +314,7 @@ fi
if test "$portaudio" = yes; then if test "$portaudio" = yes; then
AC_DEFINE(USE_PORTAUDIO, 1, [Define if you want PORTAUDIO used.]) 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 start_portaudio.c")
if test ! -e "portaudio/lib/libportaudio.a" ; then LDFLAGS="-Lportaudio-v19/lib/libportaudio.a ${LDFLAGS} -lsamplerate"
echo "Building portaudio"
(cd portaudio; ./configure --with-jack=no;make)
fi
LDFLAGS="./portaudio/lib/libportaudio.a ${LDFLAGS} -lsamplerate"
fi fi
if test "$jack" = yes; then if test "$jack" = yes; then