From 9c0e19a3be2288db79e2502e5fa450c3e20a668d Mon Sep 17 00:00:00 2001 From: Guenter Geiger Date: Fri, 9 May 2003 16:04:00 +0000 Subject: This commit was generated by cvs2svn to compensate for changes in r610, which included commits to RCS files with non-trunk default branches. svn path=/trunk/; revision=611 --- pd/src/configure.in | 94 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'pd/src/configure.in') diff --git a/pd/src/configure.in b/pd/src/configure.in index da70b29e..52d45609 100644 --- a/pd/src/configure.in +++ b/pd/src/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(d_arithmetic.c) AC_SUBST(alsa) -AC_SUBST(rme) +AC_SUBST(jack) AC_SUBST(PDLIB) AC_SUBST(DEFINES) AC_SUBST(MORECFLAGS) @@ -20,12 +20,10 @@ dnl other defaults dnl check for features -AC_ARG_ENABLE(alsa, [ --enable-alsa compile ALSA support], - alsa="yes") -AC_ARG_ENABLE(old-alsa,[ --enable-old-alsa ALSA 0.5x support], - alsa="old") -AC_ARG_ENABLE(rme, [ --enable-rme compile RME support], - rme="yes") +AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA], + alsa="no") +AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], + jack="yes") AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_OPT_CFLAGS="NO", USE_OPT_CFLAGS="YES") @@ -70,10 +68,8 @@ AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1) dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. -if test "$alsa" = yes; then - AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound",alsa="") -elif test "$alsa" = old; then - AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound",alsa="") +if test "$alsa" != no; then + AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="") fi dnl Find paths to includes and libraries for X11 @@ -84,15 +80,7 @@ AC_CHECK_LIB(X11, XCreateWindow, LIBS="$LIBS -lX11 -L$x_libraries", dnl look for tcl 8.x... do I really have to go through all this!? -AC_CHECK_HEADER(tcl.h,, - AC_CHECK_HEADER(tcl8.1/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.1", - AC_CHECK_HEADER(tcl8.2/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.2", - AC_CHECK_HEADER(tcl8.3/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.3", - AC_CHECK_HEADER(tcl8.4/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.4", - AC_CHECK_HEADER(tcl8.5/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.5", - AC_CHECK_HEADER(tcl8.6/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.5", - AC_CHECK_HEADER(tcl8.7/tcl.h,GUIFLAGS="$GUIFLAGS -I /usr/include/tcl8.5", - echo "no tcl/tk header found" || exit 1)))))))) +AC_CHECK_HEADER(tcl.h,, echo "no tcl/tk header found" || exit 1) AC_CHECK_LIB(tcl8.7, main,, AC_CHECK_LIB(tcl8.6, main,, @@ -114,24 +102,29 @@ dnl Checking for tk.h or tkstep.h - not used at the moment dnl AC_CHECK_HEADER(tk.h,DEFINES="$DEFINES -DTKINC=\\\"tk.h\\\"") dnl AC_CHECK_HEADER(tkstep.h,DEFINES="$DEFINES -DTKINC=\\\"tkstep.h\\\"") - -if test `uname -s` = FreeBSD; -then - LDFLAGS="-Wl,-export-dynamic" - EXT=pd_freebsd - MORECFLAGS=-DDL_OPEN - SYSSRC=s_freebsd.c - STRIPFLAG=-s - GUINAME="pd-gui" - OSNUMBER=0 -fi - if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" EXT=pd_linux - MORECFLAGS=-DDL_OPEN - SYSSRC=s_linux.c + MORECFLAGS="-DDL_OPEN -DUSEAPI_PORTAUDIO -DPA_USE_OSS -DPA_LITTLE_ENDIAN \ + -DUSEAPI_OSS \ + -I../portaudio/pa_common \ + -I../portaudio/pablio -I../portaudio/portmidi-macosx -Werror" + SYSSRC="s_midi_oss.c s_audio_pa.c s_audio_oss.c \ + ../portaudio/pa_common/pa_allocation.c \ + ../portaudio/pa_common/pa_converters.c \ + ../portaudio/pa_common/pa_cpuload.c \ + ../portaudio/pa_common/pa_dither.c \ + ../portaudio/pa_common/pa_front.c \ + ../portaudio/pa_common/pa_process.c \ + ../portaudio/pa_common/pa_skeleton.c \ + ../portaudio/pa_common/pa_stream.c \ + ../portaudio/pa_common/pa_trace.c \ + ../portaudio/pablio/pablio_pd.c \ + ../portaudio/pablio/ringbuffer_pd.c \ + ../portaudio/pa_unix/pa_unix_hostapis.c \ + ../portaudio/pa_unix/pa_unix_util.c \ + ../portaudio/pa_unix_oss/pa_unix_oss.c " STRIPFLAG=-s GUINAME="pd-gui" if test $USE_OPT_CFLAGS == "YES"; @@ -143,6 +136,8 @@ then OSNUMBER=0 fi +dnl **** note -- SGI/IRIX code is broken here!!! *** + if test `uname -s` = IRIX64; then LDFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ @@ -173,19 +168,24 @@ then -framework AudioUnit -framework AudioToolbox \ -framework Carbon -framework CoreMIDI" EXT=pd_darwin - MORECFLAGS="-DMACOSX -I/usr/X11R6/include -I../portaudio/pa_common \ - -I../portaudio/pablio -I../portaudio/portmidi-macosx -Wno-error" - SYSSRC="s_mac.c s_portaudio.c ../portaudio/pa_common/pa_lib.c \ - ../portaudio/pa_common/pa_trace.c \ - ../portaudio/pa_common/pa_convert.c \ - ../portaudio/pablio/pablio_pd.c \ - ../portaudio/pablio/ringbuffer_pd.c \ - ../portaudio/pa_mac_core/pa_mac_core.c \ - ../portaudio/portmidi-macosx/pmdarwin.c \ - ../portaudio/portmidi-macosx/pmmacosx.c \ - ../portaudio/portmidi-macosx/pmutil.c \ - ../portaudio/portmidi-macosx/portmidi.c \ - ../portaudio/portmidi-macosx/ptdarwin.c " + MORECFLAGS="-DMACOSX -I/usr/X11R6/include \ + -I../portaudio_v18/pa_common \ + -I../portaudio_v18/pablio \ + -I../portmidi_osx \ + -Wno-error \ + -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" + SYSSRC="s_midi_pm.c s_audio_pa.c \ + ../portaudio_v18/pa_common/pa_lib.c \ + ../portaudio_v18/pa_common/pa_trace.c \ + ../portaudio_v18/pa_common/pa_convert.c \ + ../portaudio_v18/pablio/pablio_pd.c \ + ../portaudio_v18/pablio/ringbuffer_pd.c \ + ../portaudio_v18/pa_mac_core/pa_mac_core.c \ + ../portmidi_osx/pmdarwin.c \ + ../portmidi_osx/pmmacosx.c \ + ../portmidi_osx/pmutil.c \ + ../portmidi_osx/portmidi.c \ + ../portmidi_osx/ptdarwin.c " STRIPFLAG="" GUINAME="pdtcl" GUIFLAGS="-framework Tcl -framework Tk \ -- cgit v1.2.1