[PD-cvs] pd/src configure.in, 1.5.4.5.2.6, 1.5.4.5.2.7 configure, 1.6.2.4, 1.6.2.5

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	configure.in configure 
Log Message:
--enable-portaudio --enable-portmidi by default; fix typo portmidi


Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** configure	21 Nov 2006 18:09:56 -0000	1.6.2.4
--- configure	21 Nov 2006 18:40:57 -0000	1.6.2.5
***************
*** 1301,1307 ****
  jack=yes
  
! portaudio=no
  
! portmidi=no
  
  binarymode=-m755
--- 1301,1307 ----
  jack=yes
  
! portaudio=yes
  
! portmidi=yes
  
  binarymode=-m755
***************
*** 6436,6449 ****
      else
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
-         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 x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
      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
  
--- 6436,6442 ----
***************
*** 6459,6463 ****
  	-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_audio_portaudio.c"
      STRIPFLAG=""
  
--- 6452,6456 ----
  	-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=""
  

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.6
retrieving revision 1.5.4.5.2.7
diff -C2 -d -r1.5.4.5.2.6 -r1.5.4.5.2.7
*** configure.in	21 Nov 2006 18:09:56 -0000	1.5.4.5.2.6
--- configure.in	21 Nov 2006 18:40:57 -0000	1.5.4.5.2.7
***************
*** 11,16 ****
  AC_SUBST(alsa, yes)
  AC_SUBST(jack, yes)
! AC_SUBST(portaudio, no)
! AC_SUBST(portmidi, no)
  AC_SUBST(binarymode, -m755)
  AC_SUBST(PDLIB)
--- 11,16 ----
  AC_SUBST(alsa, yes)
  AC_SUBST(jack, yes)
! AC_SUBST(portaudio, yes)
! AC_SUBST(portmidi, yes)
  AC_SUBST(binarymode, -m755)
  AC_SUBST(PDLIB)
***************
*** 156,169 ****
      else
  	OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
-         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 x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
-     if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
      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
  
--- 156,162 ----
***************
*** 179,183 ****
  	-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_audio_portaudio.c"
      STRIPFLAG=""
  
--- 172,176 ----
  	-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=""