[PD-cvs] pd/src configure, 1.6.2.8, 1.6.2.9 configure.in, 1.5.4.5.2.10, 1.5.4.5.2.11

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	configure configure.in 
Log Message:
distinguish between portaudio 18 (refuse) and 19 (accept)


Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -d -r1.6.2.8 -r1.6.2.9
*** configure	21 Nov 2006 22:14:50 -0000	1.6.2.8
--- configure	22 Nov 2006 03:44:52 -0000	1.6.2.9
***************
*** 4579,6114 ****
  
  
- 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
- if test "${ac_cv_header_tcl_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
[...1586 lines suppressed...]
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ac_cv_lib_portaudio_Pa_GetDeviceCount=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5
+ echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6
+ if test $ac_cv_lib_portaudio_Pa_GetDeviceCount = yes; then
+   PDLIB=$PDLIB" -lportaudio" ; portaudio=yes
+ else
+   portaudio=no
+ fi
+ 
+ fi
+ 
  #----------------------------------------------------------------------------------
  # section 2: generate Makefile

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.10
retrieving revision 1.5.4.5.2.11
diff -C2 -d -r1.5.4.5.2.10 -r1.5.4.5.2.11
*** configure.in	21 Nov 2006 22:14:50 -0000	1.5.4.5.2.10
--- configure.in	22 Nov 2006 03:44:52 -0000	1.5.4.5.2.11
***************
*** 71,97 ****
  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,,
-     AC_CHECK_LIB(tcl8.6, main,,
- 	AC_CHECK_LIB(tcl8.5, main,,
- 	    AC_CHECK_LIB(tcl8.4, main,,
- 		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,,
- 	AC_CHECK_LIB(tk8.5, main,,
- 	    AC_CHECK_LIB(tk8.4, main,,
- 		AC_CHECK_LIB(tk8.3, main,,
- 		    echo no tk library found || exit 1)))))
- 
  if test x$oss == "xyes"; then
    AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no")
--- 71,74 ----
***************
*** 109,112 ****
--- 86,94 ----
  fi
  
+ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
+ if test x$portaudio == xyes; then
+    AC_CHECK_LIB(portaudio,Pa_GetDeviceCount,PDLIB=$PDLIB" -lportaudio" ; portaudio=yes,portaudio=no)
+ fi
+ 
  #----------------------------------------------------------------------------------
  # section 2: generate Makefile