Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21134
Modified Files: Tag: devel_0_38 configure.in Log Message: Fixes for jack support and CPU tuning
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.3 retrieving revision 1.5.4.4 diff -C2 -d -r1.5.4.3 -r1.5.4.4 *** configure.in 11 Nov 2004 22:30:41 -0000 1.5.4.3 --- configure.in 24 Nov 2004 18:55:18 -0000 1.5.4.4 *************** *** 14,17 **** --- 14,18 ---- AC_SUBST(EXTERNTARGET) AC_SUBST(CC) + AC_SUBST(PDLIB)
*************** *** 54,62 ****
AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], ! AC_CHECK_LIB(rt,shm_open) ! AC_CHECK_LIB(jack,jack_set_error_function) ! AC_CHECK_LIB(jack,jack_set_xrun_callback, ! MORECFLAGS="$MORECFLAGS -DJACK_XRUN") ! )
AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio], --- 55,59 ----
AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], ! jack=$enableval, jack=no)
AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio], *************** *** 130,133 **** --- 127,142 ---- fi
+ if test x$jack == xyes; then + AC_CHECK_LIB(rt,shm_open) + AC_CHECK_LIB(jack,jack_set_error_function) + AC_CHECK_LIB(jack,jack_set_xrun_callback, + MORECFLAGS="$MORECFLAGS -DJACK_XRUN" + ) + + SYSSRC=$SYSSRC" s_audio_jack.c" + MORECFLAGS="$MORECFLAGS -DUSEAPI_JACK" + PDLIB="$PDLIB -ljack" + fi + if test `uname -s` == Linux; then *************** *** 149,163 **** else if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-mtune=pentium4 -march=pentium4 -mmmx -msse -msse2 -mfpmath=sse" fi if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-mtune=pentium3 -march=pentium3 -mmmx -msse -mfpmath=sse" fi if test "$optimize" == "pentium2"; then ! ARCH_CFLAGS="-mtune=pentium2 -march=pentium2 -mmmx"; MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" fi if test "$optimize" == "pentium"; then ! ARCH_CFLAGS="-mtune=pentium -march=pentium" MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" fi --- 158,172 ---- else if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-march=pentium4 -mmmx -msse -msse2 -mfpmath=sse" fi if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-march=pentium3 -mmmx -msse -mfpmath=sse" fi if test "$optimize" == "pentium2"; then ! ARCH_CFLAGS="-march=pentium2 -mmmx"; MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" fi if test "$optimize" == "pentium"; then ! ARCH_CFLAGS="-march=pentium" MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" fi *************** *** 172,176 **** -I../portaudio/portmidi-macosx \ -fno-strict-aliasing" ! SYSSRC="s_midi_oss.c s_audio_oss.c" if test x$alsa == "xyes"; then --- 181,185 ---- -I../portaudio/portmidi-macosx \ -fno-strict-aliasing" ! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" if test x$alsa == "xyes"; then *************** *** 183,187 **** then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"$MORECFLAGS ! SYSSRC="s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ --- 192,196 ---- then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"$MORECFLAGS ! SYSSRC=$SYSSRC" s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ *************** *** 197,201 **** ../portaudio/pa_unix/pa_unix_hostapis.c \ ../portaudio/pa_unix/pa_unix_util.c \ ! ../portaudio/pa_unix_oss/pa_unix_oss.c "$SYSSRC if test x$alsa == "xyes"; then --- 206,210 ---- ../portaudio/pa_unix/pa_unix_hostapis.c \ ../portaudio/pa_unix/pa_unix_util.c \ ! ../portaudio/pa_unix_oss/pa_unix_oss.c " if test x$alsa == "xyes"; then *************** *** 243,247 **** -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" ! SYSSRC="s_midi_pm.c s_audio_pa.c s_audio_pablio.c s_audio_paring.c \ ../portaudio/pa_common/pa_lib.c \ ../portaudio/pa_common/pa_trace.c \ --- 252,256 ---- -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" ! SYSSRC=$SYSSRC" s_midi_pm.c s_audio_pa.c s_audio_pablio.c s_audio_paring.c \ ../portaudio/pa_common/pa_lib.c \ ../portaudio/pa_common/pa_trace.c \