[PD-cvs] pd/src configure, 1.6.2.6, 1.6.2.7 configure.in, 1.5.4.5.2.8, 1.5.4.5.2.9
Mathieu Bouchard
matju at users.sourceforge.net
Tue Nov 21 23:13:15 CET 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14990
Modified Files:
Tag: devel_0_39
configure configure.in
Log Message:
again trying to reorganise things
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -d -r1.6.2.6 -r1.6.2.7
*** configure 21 Nov 2006 20:18:19 -0000 1.6.2.6
--- configure 21 Nov 2006 22:13:13 -0000 1.6.2.7
***************
*** 841,848 ****
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
! --enable-alsa alsa audio driver
! --enable-jack jack audio server
! --enable-portaudio portaudio
! --enable-portmidi portmidi
--enable-debug debugging support
--enable-static link statically
--- 841,849 ----
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
! --enable-oss audio via OSS
! --enable-alsa audio via ALSA
! --enable-jack audio via JACK
! --enable-portaudio audio via PortAudio
! --enable-portmidi MIDI via PortMidi
--enable-debug debugging support
--enable-static link statically
***************
*** 1327,1330 ****
--- 1328,1336 ----
alsa=$enableval
fi;
+ # Check whether --enable-alsa or --disable-alsa was given.
+ if test "${enable_alsa+set}" = set; then
+ enableval="$enable_alsa"
+ alsa=$enableval
+ fi;
# Check whether --enable-jack or --disable-jack was given.
if test "${enable_jack+set}" = set; then
***************
*** 6540,6543 ****
--- 6546,6557 ----
# section 2: generate Makefile
+ SYSSRC=""
+
+ if test x$USE_DEBUG_CFLAGS == "xyes"; then
+ OPT_CFLAGS="-O1 -g"
+ else
+ OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
+ fi
+
if test `uname -s` = Linux; then
LDFLAGS="-Wl,-export-dynamic"
***************
*** 6545,6556 ****
EXT=pd_linux
MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing"
! SYSSRC="s_midi_oss.c s_audio_oss.c"
if test x$setuid == "xyes"; then binarymode="-m4755"; fi
STRIPFLAG=-s
- if test x$USE_DEBUG_CFLAGS == "xyes"; then
- OPT_CFLAGS="-g"
- else
- OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
- fi
OSNUMBER=0
if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
--- 6559,6565 ----
EXT=pd_linux
MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing"
! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c"
if test x$setuid == "xyes"; then binarymode="-m4755"; fi
STRIPFLAG=-s
OSNUMBER=0
if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
***************
*** 6562,6567 ****
EXT=pd_darwin
MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO"
- # SYSSRC="s_midi_pm.c s_audio_pa.c s_audio_pablio.c s_audio_paring.c"
- SYSSRC="s_midi_pm.c s_audio_portaudio.c"
STRIPFLAG=""
--- 6571,6574 ----
***************
*** 6581,6589 ****
-I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \
-I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders"
- if test x$USE_DEBUG_CFLAGS == "xyes"; then
- OPT_CFLAGS="-g -O1"
- else
- OPT_CFLAGS="-O3"
- fi
OSNUMBER=2
EXTERNTARGET=pd_darwin
--- 6588,6591 ----
***************
*** 6603,6616 ****
if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test `uname -s` = Linux; then
! if test x$portaudio19 == "xyes"; then
! MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 "$MORECFLAGS
! SYSSRC="s_audio_portaudio.c"
! fi
! if test x$portaudio18 == "xyes"; then
! MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS
! SYSSRC="s_audio_pa.c s_audio_pablio.c s_audio_paring.c"
! fi
fi
ac_config_files="$ac_config_files makefile"
--- 6605,6613 ----
if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test x$portaudio == "xyes"; then
! MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! SYSSRC=$SYSSRC" s_audio_portaudio.c"
fi
+ if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi
ac_config_files="$ac_config_files makefile"
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.8
retrieving revision 1.5.4.5.2.9
diff -C2 -d -r1.5.4.5.2.8 -r1.5.4.5.2.9
*** configure.in 21 Nov 2006 20:18:20 -0000 1.5.4.5.2.8
--- configure.in 21 Nov 2006 22:13:13 -0000 1.5.4.5.2.9
***************
*** 29,36 ****
dnl Checks for features.
! AC_ARG_ENABLE(alsa, [ --enable-alsa alsa audio driver], alsa=$enableval)
! AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], jack=$enableval)
! AC_ARG_ENABLE(portaudio,[ --enable-portaudio portaudio], portaudio=$enableval)
! AC_ARG_ENABLE(portmidi, [ --enable-portmidi portmidi], portmidi=$enableval)
AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_DEBUG_CFLAGS=$enableval)
AC_ARG_ENABLE(static, [ --enable-static link statically], static=$enableval)
--- 29,37 ----
dnl Checks for features.
! AC_ARG_ENABLE(alsa, [ --enable-oss audio via OSS], alsa=$enableval)
! AC_ARG_ENABLE(alsa, [ --enable-alsa audio via ALSA], alsa=$enableval)
! AC_ARG_ENABLE(jack, [ --enable-jack audio via JACK], jack=$enableval)
! AC_ARG_ENABLE(portaudio,[ --enable-portaudio audio via PortAudio], portaudio=$enableval)
! AC_ARG_ENABLE(portmidi, [ --enable-portmidi MIDI via PortMidi], portmidi=$enableval)
AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_DEBUG_CFLAGS=$enableval)
AC_ARG_ENABLE(static, [ --enable-static link statically], static=$enableval)
***************
*** 112,115 ****
--- 113,124 ----
# section 2: generate Makefile
+ SYSSRC=""
+
+ if test x$USE_DEBUG_CFLAGS == "xyes"; then
+ OPT_CFLAGS="-O1 -g"
+ else
+ OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
+ fi
+
if test `uname -s` = Linux; then
LDFLAGS="-Wl,-export-dynamic"
***************
*** 117,128 ****
EXT=pd_linux
MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing"
! SYSSRC="s_midi_oss.c s_audio_oss.c"
if test x$setuid == "xyes"; then binarymode="-m4755"; fi
STRIPFLAG=-s
- if test x$USE_DEBUG_CFLAGS == "xyes"; then
- OPT_CFLAGS="-g"
- else
- OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
- fi
OSNUMBER=0
if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
--- 126,132 ----
EXT=pd_linux
MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing"
! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c"
if test x$setuid == "xyes"; then binarymode="-m4755"; fi
STRIPFLAG=-s
OSNUMBER=0
if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
***************
*** 134,138 ****
EXT=pd_darwin
MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO"
- SYSSRC="s_midi_pm.c s_audio_portaudio.c"
STRIPFLAG=""
--- 138,141 ----
***************
*** 152,160 ****
-I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \
-I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders"
- if test x$USE_DEBUG_CFLAGS == "xyes"; then
- OPT_CFLAGS="-g -O1"
- else
- OPT_CFLAGS="-O3"
- fi
OSNUMBER=2
EXTERNTARGET=pd_darwin
--- 155,158 ----
***************
*** 174,183 ****
if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test `uname -s` = Linux; then
! if test x$portaudio19 == "xyes"; then
! MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 "$MORECFLAGS
! SYSSRC="s_audio_portaudio.c"
! fi
fi
AC_OUTPUT(makefile)
--- 172,180 ----
if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test x$portaudio == "xyes"; then
! MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
! SYSSRC=$SYSSRC" s_audio_portaudio.c"
fi
+ if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi
AC_OUTPUT(makefile)
More information about the Pd-cvs
mailing list