[PD-cvs] pd/src configure.in,1.5.4.5.2.16.2.14,1.5.4.5.2.16.2.15

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	configure.in 
Log Message:
non-bash portability fix


Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.16.2.14
retrieving revision 1.5.4.5.2.16.2.15
diff -C2 -d -r1.5.4.5.2.16.2.14 -r1.5.4.5.2.16.2.15
*** configure.in	3 Jan 2007 20:33:41 -0000	1.5.4.5.2.16.2.14
--- configure.in	5 Aug 2007 17:19:07 -0000	1.5.4.5.2.16.2.15
***************
*** 121,134 ****
  AC_CHECK_LIB(pthread, pthread_create,LDFLAGS="$LDFLAGS -lpthread", echo "pthreads required" || 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,LDFLAGS="$LDFLAGS -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,jack=xrun,jack=no)
--- 121,134 ----
  AC_CHECK_LIB(pthread, pthread_create,LDFLAGS="$LDFLAGS -lpthread", echo "pthreads required" || 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,LDFLAGS="$LDFLAGS -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,jack=xrun,jack=no)
***************
*** 137,150 ****
  
  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,LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes,portaudio=no)
  fi
  
! if test x$portmidi == xyes; then
     AC_CHECK_LIB(porttime,Pt_Started   ,LDFLAGS=$LDFLAGS" -lporttime")
     AC_CHECK_LIB(portmidi,Pm_Initialize,LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes,portmidi=no)
  fi
  
! if test x$USE_DEBUG_CFLAGS == xyes; then
      MORECFLAGS=$MORECFLAGS" -O1 -g"
  else
--- 137,150 ----
  
  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,LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes,portaudio=no)
  fi
  
! if test x$portmidi = xyes; then
     AC_CHECK_LIB(porttime,Pt_Started   ,LDFLAGS=$LDFLAGS" -lporttime")
     AC_CHECK_LIB(portmidi,Pm_Initialize,LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes,portmidi=no)
  fi
  
! if test x$USE_DEBUG_CFLAGS = xyes; then
      MORECFLAGS=$MORECFLAGS" -O1 -g"
  else
***************
*** 152,156 ****
  fi
  
! if test x$oss == xyes; then
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
--- 152,156 ----
  fi
  
! if test x$oss = xyes; then
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
***************
*** 158,162 ****
  fi
  
! if test x$alsa == xyes; then
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
--- 158,162 ----
  fi
  
! if test x$alsa = xyes; then
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
***************
*** 165,174 ****
  fi
  
! if test x$jack == xyes; then
    AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
    if test x$jack != xno; then
        if test `uname -s` = Linux; then
!           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
--- 165,174 ----
  fi
  
! if test x$jack = xyes; then
    AUDIOSRC=$AUDIOSRC" s_audio_jack.c"
    if test x$jack != xno; then
        if test `uname -s` = Linux; then
!           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
***************
*** 180,187 ****
        CPPFLAGS=$CPPFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack == "xrun"; then CPPFLAGS=$CPPFLAGS" -DJACK_XRUN"; fi
  fi
  
! if test x$portaudio == xyes; then
      CPPFLAGS=$CPPFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
--- 180,187 ----
        CPPFLAGS=$CPPFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack = "xrun"; then CPPFLAGS=$CPPFLAGS" -DJACK_XRUN"; fi
  fi
  
! if test x$portaudio = xyes; then
      CPPFLAGS=$CPPFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
***************
*** 191,195 ****
  fi
  
! if test x$portmidi == xyes; then
      MIDISRC="s_midi_pm.c"
      MIDIFLAGS="-DUSEAPI_PORTMIDI"
--- 191,195 ----
  fi
  
! if test x$portmidi = xyes; then
      MIDISRC="s_midi_pm.c"
      MIDIFLAGS="-DUSEAPI_PORTMIDI"
***************
*** 201,205 ****
  CPPFLAGS=$CPPFLAGS" $MIDIFLAGS"
  
! if test x$fftw == "xyes"; then
      AC_CHECK_LIB(fftw3f, fftwf_forget_wisdom ,LDFLAGS=$LDFLAGS" -lfftw3f",fftw=no)
  fi
--- 201,205 ----
  CPPFLAGS=$CPPFLAGS" $MIDIFLAGS"
  
! if test x$fftw = "xyes"; then
      AC_CHECK_LIB(fftw3f, fftwf_forget_wisdom ,LDFLAGS=$LDFLAGS" -lfftw3f",fftw=no)
  fi