[PD-cvs] pd/src configure, 1.6.2.5, 1.6.2.6 configure.in, 1.5.4.5.2.7, 1.5.4.5.2.8

Mathieu Bouchard matju at users.sourceforge.net
Tue Nov 21 21:18:22 CET 2006


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5345

Modified Files:
      Tag: devel_0_39
	configure configure.in 
Log Message:
huh.


Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -d -r1.6.2.5 -r1.6.2.6
*** configure	21 Nov 2006 18:40:57 -0000	1.6.2.5
--- configure	21 Nov 2006 20:18:19 -0000	1.6.2.6
***************
*** 310,314 ****
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC TCLTK_FRAMEWORKS_PATH STRIPFLAG GUIFLAGS OSNUMBER EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
--- 310,314 ----
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC TCLTK_FRAMEWORKS_PATH STRIPFLAG GUIFLAGS OSNUMBER EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 1296,1299 ****
--- 1296,1300 ----
  
  
+ oss=yes
  
  alsa=yes
***************
*** 1321,1325 ****
  
  
- 
  # Check whether --enable-alsa or --disable-alsa was given.
  if test "${enable_alsa+set}" = set; then
--- 1322,1325 ----
***************
*** 4303,4306 ****
--- 4303,4307 ----
  
  
+ 
  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
  echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
***************
*** 4372,4376 ****
  fi
  
- 
  echo "$as_me:$LINENO: checking for sin in -lffm" >&5
  echo $ECHO_N "checking for sin in -lffm... $ECHO_C" >&6
--- 4373,4376 ----
***************
*** 4440,4444 ****
  fi
  
- 
  echo "$as_me:$LINENO: checking for sin in -lm" >&5
  echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6
--- 4440,4443 ----
***************
*** 4510,4514 ****
  fi
  
- 
  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
  echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
--- 4509,4512 ----
***************
*** 4581,4588 ****
  
  
- 
  foundit=no
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl.h" >&5
  echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
--- 4579,4584 ----
  
  
  foundit=no
! if test $foundit == "no"; then if test "${ac_cv_header_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl.h" >&5
  echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
***************
*** 4724,4731 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl8_7_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.7/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.7/tcl.h... $ECHO_C" >&6
--- 4720,4725 ----
  fi
  
!  fi
! if test $foundit == "no"; then if test "${ac_cv_header_tcl8_7_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.7/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.7/tcl.h... $ECHO_C" >&6
***************
*** 4867,4874 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl8_6_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.6/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.6/tcl.h... $ECHO_C" >&6
--- 4861,4866 ----
  fi
  
!  fi
! if test $foundit == "no"; then if test "${ac_cv_header_tcl8_6_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.6/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.6/tcl.h... $ECHO_C" >&6
***************
*** 5010,5017 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl8_5_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.5/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.5/tcl.h... $ECHO_C" >&6
--- 5002,5007 ----
  fi
  
!  fi
! if test $foundit == "no"; then if test "${ac_cv_header_tcl8_5_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.5/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.5/tcl.h... $ECHO_C" >&6
***************
*** 5153,5160 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl8_4_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.4/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.4/tcl.h... $ECHO_C" >&6
--- 5143,5148 ----
  fi
  
!  fi
! if test $foundit == "no"; then if test "${ac_cv_header_tcl8_4_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.4/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.4/tcl.h... $ECHO_C" >&6
***************
*** 5296,5303 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     if test "${ac_cv_header_tcl8_3_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.3/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.3/tcl.h... $ECHO_C" >&6
--- 5284,5289 ----
  fi
  
!  fi
! if test $foundit == "no"; then if test "${ac_cv_header_tcl8_3_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl8.3/tcl.h" >&5
  echo $ECHO_N "checking for tcl8.3/tcl.h... $ECHO_C" >&6
***************
*** 5439,5448 ****
  fi
  
! 
! fi
! if test $foundit == "no"; then
!     echo no tcl header found
!     exit -1
! fi
  
  
--- 5425,5430 ----
  fi
  
!  fi
! if test $foundit == "no"; then echo no tcl header found; exit -1; fi
  
  
***************
*** 5788,5792 ****
  
  
- 
  echo "$as_me:$LINENO: checking for main in -ltk8.7" >&5
  echo $ECHO_N "checking for main in -ltk8.7... $ECHO_C" >&6
--- 5770,5773 ----
***************
*** 6130,6137 ****
  
  
! if test `uname -s` = Linux; then
!         echo .................... alsa= $alsa
!         if test x$alsa == xyes; then
! 	echo "$as_me:$LINENO: checking for snd_pcm_info in -lasound" >&5
  echo $ECHO_N "checking for snd_pcm_info in -lasound... $ECHO_C" >&6
  if test "${ac_cv_lib_asound_snd_pcm_info+set}" = set; then
--- 6111,6262 ----
  
  
! if test x$oss == "xyes"; then
!   if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
!   echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
! echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6
! if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! fi
! echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
! echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6
! else
!   # Is the header compilable?
! echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5
! echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! $ac_includes_default
! #include <linux/soundcard.h>
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_header_compiler=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_header_compiler=no
! fi
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
! 
! # Is the header present?
! echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5
! echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #include <linux/soundcard.h>
! _ACEOF
! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
!   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } >/dev/null; then
!   if test -s conftest.err; then
!     ac_cpp_err=$ac_c_preproc_warn_flag
!     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
!   else
!     ac_cpp_err=
!   fi
! else
!   ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
!   ac_header_preproc=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
!   ac_header_preproc=no
! fi
! rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
! 
! # So?  What about this header?
! case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
!   yes:no: )
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
! echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5
! echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;}
!     ac_header_preproc=yes
!     ;;
!   no:yes:* )
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5
! echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&5
! echo "$as_me: WARNING: linux/soundcard.h:     check for missing prerequisite headers?" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5
! echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&5
! echo "$as_me: WARNING: linux/soundcard.h:     section \"Present But Cannot Be Compiled\"" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;}
!     { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5
! echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------------ ##
! ## Report this to the AC_PACKAGE_NAME lists.  ##
! ## ------------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
! esac
! echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
! echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6
! if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_cv_header_linux_soundcard_h=$ac_header_preproc
! fi
! echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
! echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6
! 
! fi
! if test $ac_cv_header_linux_soundcard_h = yes; then
!   oss="yes"
! else
!   oss="no"
! fi
! 
! 
! fi
! 
! if test x$alsa == xyes; then
!    echo "$as_me:$LINENO: checking for snd_pcm_info in -lasound" >&5
  echo $ECHO_N "checking for snd_pcm_info in -lasound... $ECHO_C" >&6
  if test "${ac_cv_lib_asound_snd_pcm_info+set}" = set; then
***************
*** 6202,6210 ****
  fi
  
!     fi
! 
  
!     if test x$jack == xyes; then
!         echo "$as_me:$LINENO: checking for shm_open in -lrt" >&5
  echo $ECHO_N "checking for shm_open in -lrt... $ECHO_C" >&6
  if test "${ac_cv_lib_rt_shm_open+set}" = set; then
--- 6327,6334 ----
  fi
  
! fi
  
! if test x$jack == xyes; then
!     echo "$as_me:$LINENO: checking for shm_open in -lrt" >&5
  echo $ECHO_N "checking for shm_open in -lrt... $ECHO_C" >&6
  if test "${ac_cv_lib_rt_shm_open+set}" = set; then
***************
*** 6273,6277 ****
  fi
  
!         echo "$as_me:$LINENO: checking for jack_set_xrun_callback in -ljack" >&5
  echo $ECHO_N "checking for jack_set_xrun_callback in -ljack... $ECHO_C" >&6
  if test "${ac_cv_lib_jack_jack_set_xrun_callback+set}" = set; then
--- 6397,6401 ----
  fi
  
!     echo "$as_me:$LINENO: checking for jack_set_xrun_callback in -ljack" >&5
  echo $ECHO_N "checking for jack_set_xrun_callback in -ljack... $ECHO_C" >&6
  if test "${ac_cv_lib_jack_jack_set_xrun_callback+set}" = set; then
***************
*** 6342,6346 ****
  fi
  
!         echo "$as_me:$LINENO: checking for jack_set_error_function in -ljack" >&5
  echo $ECHO_N "checking for jack_set_error_function in -ljack... $ECHO_C" >&6
  if test "${ac_cv_lib_jack_jack_set_error_function+set}" = set; then
--- 6466,6470 ----
  fi
  
!     echo "$as_me:$LINENO: checking for jack_set_error_function in -ljack" >&5
  echo $ECHO_N "checking for jack_set_error_function in -ljack... $ECHO_C" >&6
  if test "${ac_cv_lib_jack_jack_set_error_function+set}" = set; then
***************
*** 6411,6433 ****
  fi
  
!     fi
  
      LDFLAGS="-Wl,-export-dynamic"
      if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi
      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$alsa == "xyes"; then
-     	SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
- 	MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
- 	LDFLAGS=$LDFLAGS" -lasound"
-     fi
- 
-     if test x$portaudio == "xyes"; then
-     	MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 "$MORECFLAGS
- 	# SYSSRC="s_audio_pa.c s_audio_pablio.c s_audio_paring.c"
- 	SYSSRC="s_audio_portaudio.c"
-     fi
      if test x$setuid == "xyes"; then binarymode="-m4755"; fi
      STRIPFLAG=-s
--- 6535,6549 ----
  fi
  
! fi
! 
! #----------------------------------------------------------------------------------
! # section 2: generate Makefile
  
+ if test `uname -s` = Linux; then
      LDFLAGS="-Wl,-export-dynamic"
      if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi
      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
***************
*** 6437,6454 ****
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
      fi
-     echo OPT_CFLAGS --------------- $OPT_CFLAGS
      OSNUMBER=0
  fi
  
- if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- 
  if test `uname -s` = Darwin; then
!     LDFLAGS="-Wl -framework CoreAudio \
!         -framework AudioUnit -framework AudioToolbox \
!         -framework Carbon -framework CoreMIDI"
      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"
--- 6553,6565 ----
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
      fi
      OSNUMBER=0
+     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
  fi
  
  if test `uname -s` = Darwin; then
!     LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
      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"
***************
*** 6477,6489 ****
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
-     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
  fi
  
! # support for jack, on either linux or darwin:
  
  if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK";             SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  
            ac_config_files="$ac_config_files makefile"
  cat >confcache <<\_ACEOF
--- 6588,6617 ----
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
  fi
  
! if test x$alsa == "xyes"; then
!     SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
!     LDFLAGS=$LDFLAGS" -lasound"
! fi
  
+ if test `uname -s` = Darwin; then
+     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
+     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
+ fi
  if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK";             SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  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"
  cat >confcache <<\_ACEOF
***************
*** 7122,7125 ****
--- 7250,7254 ----
  s, at ECHO_T@,$ECHO_T,;t t
  s, at LIBS@,$LIBS,;t t
+ s, at oss@,$oss,;t t
  s, at alsa@,$alsa,;t t
  s, at jack@,$jack,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.7
retrieving revision 1.5.4.5.2.8
diff -C2 -d -r1.5.4.5.2.7 -r1.5.4.5.2.8
*** configure.in	21 Nov 2006 18:40:57 -0000	1.5.4.5.2.7
--- configure.in	21 Nov 2006 20:18:20 -0000	1.5.4.5.2.8
***************
*** 6,12 ****
  # have to have autoconf installed.
  #
! dnl Process this file with autoconf to produce a configure script.
! AC_INIT(d_arithmetic.c)
  
  AC_SUBST(alsa, yes)
  AC_SUBST(jack, yes)
--- 6,13 ----
  # have to have autoconf installed.
  #
! # section 1: detect software.
  
+ AC_INIT(d_arithmetic.c)
+ AC_SUBST(oss, yes)
  AC_SUBST(alsa, yes)
  AC_SUBST(jack, yes)
***************
*** 27,32 ****
  AC_SUBST(EXTERNTARGET)
  
! dnl check for features
! 
  AC_ARG_ENABLE(alsa,     [ --enable-alsa      alsa audio driver],          alsa=$enableval)
  AC_ARG_ENABLE(jack,     [ --enable-jack      jack audio server],          jack=$enableval)
--- 28,32 ----
  AC_SUBST(EXTERNTARGET)
  
! 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)
***************
*** 61,105 ****
  
  dnl Checks for libraries.
- dnl Checking for `dlopen' function in -ldl:
- AC_CHECK_LIB(dl, dlopen,PDLIB="$PDLIB -ldl",
-                  echo "dynamic link support required" || exit 1)
  
! dnl Checking for `sin' function in -lffm:
! dnl ffm is the fast math library on the alpha
  AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm")
- 
  dnl Checking for `sin' function in -lm:
! AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm",
! 	         echo "math library required" || exit 1)
! 
  dnl Checking for `pthread_create' function in -pthread
! AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread",
!          echo "pthreads required" || exit 1)
  
  dnl look for tcl 8.x... do I really have to go through all this!?
- 
  foundit=no
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl.h,foundit=yes,)
! fi
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl8.7/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,)
! fi
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl8.6/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,)
! fi
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl8.5/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,)
! fi
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl8.4/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,)
! fi
! if test $foundit == "no"; then
!     AC_CHECK_HEADER(tcl8.3/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,)
! fi
! if test $foundit == "no"; then
!     echo no tcl header found
!     exit -1
! fi
  
  AC_CHECK_LIB(tcl8.7, main,,
--- 61,83 ----
  
  dnl Checks for libraries.
  
! dnl Checking for `dlopen' function in -ldl:
! AC_CHECK_LIB(dl, dlopen,PDLIB="$PDLIB -ldl", echo "dynamic link support required" || exit 1)
! dnl Checking for `sin' function in -lffm (ffm is the fast math library on the alpha)
  AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm")
  dnl Checking for `sin' function in -lm:
! AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", echo "math library required" || exit 1)
  dnl Checking for `pthread_create' function in -pthread
! AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1)
  
  dnl look for tcl 8.x... do I really have to go through all this!?
  foundit=no
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl.h,foundit=yes,) fi
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl8.7/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) fi
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl8.6/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) fi
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl8.5/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) fi
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl8.4/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) fi
! if test $foundit == "no"; then AC_CHECK_HEADER(tcl8.3/tcl.h, GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) fi
! if test $foundit == "no"; then echo no tcl header found; exit -1; fi
  
  AC_CHECK_LIB(tcl8.7, main,,
***************
*** 109,113 ****
  		AC_CHECK_LIB(tcl8.3, main,,
  		    echo no tcl library found || exit 1)))))
- 
  AC_CHECK_LIB(tk8.7, main,,
      AC_CHECK_LIB(tk8.6, main,,
--- 87,90 ----
***************
*** 117,153 ****
  		    echo no tk library found || exit 1)))))
  
! if test `uname -s` = Linux; then
!     dnl Ckecking for ALSA
!     echo .................... alsa= $alsa
!     dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
!     if test x$alsa == xyes; then
! 	AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no")
!     fi
  
!     dnl Checking for JACK
  
!     if test x$jack == xyes; then
!         AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt")
!         AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no)
!         AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no)
!     fi
  
      LDFLAGS="-Wl,-export-dynamic"
      if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi
      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$alsa == "xyes"; then
-     	SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
- 	MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
- 	LDFLAGS=$LDFLAGS" -lasound"
-     fi
- 
-     if test x$portaudio == "xyes"; then
-     	MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 "$MORECFLAGS
- 	# SYSSRC="s_audio_pa.c s_audio_pablio.c s_audio_paring.c"
- 	SYSSRC="s_audio_portaudio.c"
-     fi
      if test x$setuid == "xyes"; then binarymode="-m4755"; fi
      STRIPFLAG=-s
--- 94,121 ----
  		    echo no tk library found || exit 1)))))
  
! if test x$oss == "xyes"; then
!   AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no")
! fi
  
! dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
! if test x$alsa == xyes; then
!    AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no")
! fi
  
! if test x$jack == xyes; then
!     AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt")
!     AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no)
!     AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no)
! fi
! 
! #----------------------------------------------------------------------------------
! # section 2: generate Makefile
  
+ if test `uname -s` = Linux; then
      LDFLAGS="-Wl,-export-dynamic"
      if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi
      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
***************
*** 157,175 ****
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
      fi
-     echo OPT_CFLAGS --------------- $OPT_CFLAGS
      OSNUMBER=0
  fi
  
- if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
- 
  if test `uname -s` = Darwin; then
!     LDFLAGS="-Wl -framework CoreAudio \
!         -framework AudioUnit -framework AudioToolbox \
!         -framework Carbon -framework CoreMIDI"
      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=""
--- 125,137 ----
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
      fi
      OSNUMBER=0
+     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
+     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
  fi
  
  if test `uname -s` = Darwin; then
!     LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
      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=""
***************
*** 197,209 ****
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
-     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
  fi
  
! # support for jack, on either linux or darwin:
  
  if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK";             SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  
  AC_OUTPUT(makefile)
  
--- 159,184 ----
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
  fi
  
! if test x$alsa == "xyes"; then
!     SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
!     LDFLAGS=$LDFLAGS" -lasound"
! fi
  
+ if test `uname -s` = Darwin; then
+     if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
+     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi
+ fi
  if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK";             SYSSRC=$SYSSRC" s_audio_jack.c"; fi
  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)
  





More information about the Pd-cvs mailing list