[PD-cvs] pd/src configure.in,1.5,1.5.4.1

Tim Blechmann timblech at users.sourceforge.net
Sat Nov 6 11:21:27 CET 2004


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

Modified Files:
      Tag: devel_0_38
	configure.in 
Log Message:
old build system

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** configure.in	6 Sep 2004 20:20:33 -0000	1.5
--- configure.in	6 Nov 2004 10:21:16 -0000	1.5.4.1
***************
*** 2,14 ****
  AC_INIT(d_arithmetic.c)
  
- AC_SUBST(alsa, yes)
- AC_SUBST(jack, no)
- AC_SUBST(portaudio, no)
  AC_SUBST(binarymode, -m755)
- AC_SUBST(PDLIB)
  AC_SUBST(MORECFLAGS)
  AC_SUBST(EXT)
  AC_SUBST(OPT_CFLAGS)
- AC_SUBST(USE_OPT_CFLAGS, yes)
  AC_SUBST(SYSSRC)
  AC_SUBST(STRIPFLAG)
--- 2,10 ----
  AC_INIT(d_arithmetic.c)
  
  AC_SUBST(binarymode, -m755)
  AC_SUBST(MORECFLAGS)
  AC_SUBST(EXT)
+ AC_SUBST(DEFS)
  AC_SUBST(OPT_CFLAGS)
  AC_SUBST(SYSSRC)
  AC_SUBST(STRIPFLAG)
***************
*** 17,39 ****
  AC_SUBST(OSNUMBER)
  AC_SUBST(EXTERNTARGET)
  
- dnl other defaults
- 
- dnl check for features
  
! AC_ARG_ENABLE(alsa,     [  --disable-alsa          disable ALSA],
!     alsa="no")
! AC_ARG_ENABLE(jack,     [  --enable-jack           jack audio server],
!     jack="yes")
! AC_ARG_ENABLE(portaudio,[  --enable-portaudio      portaudio],
!     portaudio="yes")
! AC_ARG_ENABLE(debug,    [  --enable-debug          debugging support],
!     USE_OPT_CFLAGS="no")
! AC_ARG_ENABLE(static,   [  --enable-static         link statically],
!     static=yes)
! AC_ARG_ENABLE(setuid,   [  --enable-setuid         install as setuid (linux)],
!     setuid=yes)
!     
! dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_INSTALL
--- 13,20 ----
  AC_SUBST(OSNUMBER)
  AC_SUBST(EXTERNTARGET)
+ AC_SUBST(CC)
  
  
! dnl other defaults
  AC_PROG_CC
  AC_PROG_INSTALL
***************
*** 59,146 ****
  
  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 Find paths to includes and libraries for X11
  AC_PATH_X
  dnl Checking for `XCreateWindow' function in -lX11:
! AC_CHECK_LIB(X11, XCreateWindow, LIBS="$LIBS -lX11 -L$x_libraries", 
  	echo "no X11 found" || exit 1, -L$x_libraries)
  
! 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
!     AC_CHECK_HEADER(tcl8.2/tcl.h,
!     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";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,,
! 		    AC_CHECK_LIB(tcl8.2, main,,
!         		AC_CHECK_LIB(tcl8.0, 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,,
! 		    AC_CHECK_LIB(tk8.2, main,,
!         		AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
  
  
! if test `uname -s` = Linux;
  then
      dnl Ckecking for ALSA
--- 40,134 ----
  
  dnl Checks for libraries.
! AC_CHECK_LIB(dl, dlopen, ,
!     echo "dynamic link support required" || exit 1)
! AC_CHECK_LIB(m, sin, ,
!     echo "math library required" || exit 1)
  
! AC_CHECK_LIB(pthread, pthread_create, ,
!     echo "pthreads required" || exit 1)
  
  
! dnl check for features
! AC_ARG_ENABLE(alsa,    [  --disable-alsa          disable ALSA],
!     alsa="no", alsa="yes")
! 
! 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],
!     portaudio=$enableval,portaudio=no)
! 
! AC_ARG_ENABLE(debug, [  --enable-debug          debugging support],
!     USE_DEBUG=$enableval,USE_DEBUG=no)
! 
! AC_ARG_ENABLE(static, [  --enable-static         link statically],
!     LDFLAGS="$LDFLAGS -static")
! 
! AC_ARG_ENABLE(setuid,   [  --enable-setuid         install as setuid (linux)],
!     setuid=yes)
! 
! AC_ARG_ENABLE(fftw, [  --enable-fftw           fftw3 support],
!     AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d))
! 
! AC_ARG_ENABLE(icc, [  --enable-icc            icc support],
!     CC=icc; icc=yes)
! 
! AC_ARG_ENABLE(optimize, [  --enable-optimize       enables optimized builds for: pentium4, pentium3, G4, G5],
!     optimize=$enableval,
!     MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD")
! 
! AC_ARG_ENABLE(simd, [  --enable-simd           use SIMD code (default=no)],
!     simdcode=$enableval,
!     MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD")
! 
! AC_ARG_ENABLE(threadedgui, [  --enable-threadedgui    use yves degoyon's threaded gui patch],
!     MORECFLAGS=$MORECFLAGS" -DTHREADED_GUI")
! 
! AC_ARG_ENABLE(threadedsf, [  --enable-threadedsf     use threaded soundfiler],
!     MORECFLAGS=$MORECFLAGS" -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE")
! 
! AC_ARG_ENABLE(gathreadlocks, [  --enable-gathreadlocks  t_garray threadlock],
!     MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE")
  
  
  dnl Find paths to includes and libraries for X11
  AC_PATH_X
+ LIBS="$LIBS -L$x_libraries"
+ 
  dnl Checking for `XCreateWindow' function in -lX11:
! AC_CHECK_LIB(X11, XCreateWindow, , 
  	echo "no X11 found" || exit 1, -L$x_libraries)
  
! dnl look for tcl 8.x...
  
! tcllib=""
  
! AC_CHECK_LIB(tcl8.7, main,tcllib=tcl8.7,
!     AC_CHECK_LIB(tcl8.6, main,tcllib=tcl8.6,
! 	AC_CHECK_LIB(tcl8.5, main,tcllib=tcl8.5,
! 	    AC_CHECK_LIB(tcl8.4, main,tcllib=tcl8.4,
! 		AC_CHECK_LIB(tcl8.3, main,tcllib=tcl8.3,
! 		    AC_CHECK_LIB(tcl8.2, main,tcllib=tcl8.2,
!         		AC_CHECK_LIB(tcl8.0, main,tcllib=tcl8.0,echo no tcl library found || exit 1)))))))
  
! LIBS="$LIBS -l$tcllib"
! tklib=${tcllib/tcl/tk}
  
+ AC_CHECK_LIB($tklib, main,,echo no tk library found || exit 1)
  
! foundit=no
! AC_CHECK_HEADER(tcl.h,foundit=yes)
! 
! if test "$foundit" = "no"; then
!    AC_CHECK_HEADER($tcllib/tcl.h,
!         GUIFLAGS="$GUIFLAGS -I/usr/include/$tcllib",
! 	    [echo no tcl header found];exit -1)
! fi
! 
! if test `uname -s` == Linux;
  then
      dnl Ckecking for ALSA
***************
*** 152,167 ****
      fi
  
!     dnl Checking for JACK
  
!     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)
  
-     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 \
          -I../portaudio/pa_common -I../portaudio/pablio \
--- 140,172 ----
      fi
  
!     dnl Set processor flags
!     if test "$icc" == "yes"; then
!        if test "$optimize" == "pentium4"; then
! 	  ARCH_CFLAGS="-xN -ip -ipo_obj"
!        fi
!        if test "$optimize" == "pentium3"; then
! 	  ARCH_CFLAGS="-xK -ip -ipo_obj"
!        fi
!     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
!     fi	       
  
!     LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  
      EXT=pd_linux
!     MORECFLAGS=$MORECFLAGS" -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUNIX -DUNISTDo\
      	 -DUSEAPI_OSS \
          -I../portaudio/pa_common -I../portaudio/pablio \
***************
*** 174,184 ****
  	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     \
  	../portaudio/pa_common/pa_allocation.c  \
  	../portaudio/pa_common/pa_converters.c  \
--- 179,189 ----
  	MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
  	LDFLAGS=$LDFLAGS" -lasound"
! 
      if test x$portaudio == "xyes";
      then
!     	MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"$MORECFLAGS
  	SYSSRC="s_audio_pa.c \
! 	s_audio_pablio.c \
! 	s_audio_paring.c \
  	../portaudio/pa_common/pa_allocation.c  \
  	../portaudio/pa_common/pa_converters.c  \
***************
*** 196,236 ****
  	then
  	    SYSSRC=$SYSSRC" ../portaudio/pa_linux_alsa/pa_linux_alsa.c"
! 	    MORECFLAGS=$MORECFLAGS" -Wno-error"
!     	fi
      fi
!     if test x$setuid == "xyes";
      then
      	binarymode="-m4755"
      fi
      STRIPFLAG=-s
      GUINAME="pd-gui"
!     if test x$USE_OPT_CFLAGS == "xyes";
!     then
! 	OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
      else
! 	OPT_CFLAGS="-g"
      fi
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
      OSNUMBER=0
  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 \
  	 -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \
  	-I../portmidi_osx \
  	-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_v18/pa_common/pa_lib.c \
! 	../portaudio_v18/pa_common/pa_trace.c \
! 	../portaudio_v18/pa_common/pa_convert.c \
! 	../portaudio_v18/pa_mac_core/pa_mac_core.c \
          ../portmidi_osx/pmdarwin.c \
          ../portmidi_osx/pmmacosx.c \
--- 201,251 ----
  	then
  	    SYSSRC=$SYSSRC" ../portaudio/pa_linux_alsa/pa_linux_alsa.c"
!     	MORECFLAGS=$MORECFLAGS" -Wno-error"
! 		fi
      fi
! 
! 	if test x$setuid == "xyes";
      then
      	binarymode="-m4755"
      fi
+ 
      STRIPFLAG=-s
      GUINAME="pd-gui"
!     if test x$USE_DEBUG == "xyes"; then
!         OPT_CFLAGS="-g"
      else
!         if test "$icc" = "yes"; then
!             OPT_CFLAGS=$ARCH_CFLAGS" -O3"
!         else
!             OPT_CFLAGS=$ARCH_CFLAGS" -O3 -funroll-loops -fomit-frame-pointer"
!         fi
!     fi
! 
!     dnl we have to add the OPT_CFLAGS to the LD_FLAGS to make sure that icc
!     dnl links with the right libraries - timblechmann at gmx.de
!     if test "$icc" = "yes"; then
! 	LDFLAGS=$LDFLAGS" "$OPT_CFLAGS
      fi
+ 
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
      OSNUMBER=0
  fi
  
! if test `uname -s` == Darwin;
  then
!     LDFLAGS=$LDFLAGS" -Wl  -framework CoreAudio \
          -framework AudioUnit -framework AudioToolbox \
          -framework Carbon -framework CoreMIDI"
      EXT=pd_darwin
!     MORECFLAGS=$MORECFLAGS" -DMACOSX -DUNISTD -I/usr/X11R6/include \
  	 -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \
  	-I../portmidi_osx \
  	-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 \
! 	../portaudio/pa_common/pa_convert.c \
! 	../portaudio/pa_mac_core/pa_mac_core.c \
          ../portmidi_osx/pmdarwin.c \
          ../portmidi_osx/pmmacosx.c \
***************
*** 244,276 ****
          -I../../Frameworks/Tcl.framework/Versions/Current/Headers \
          -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders"
!     if test x$USE_OPT_CFLAGS == "xyes";
!     then
! 	OPT_CFLAGS="-O2"
      else
! 	OPT_CFLAGS="-g"
      fi
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
!     if test x$jack == "xyes";
!     then
!     	LDFLAGS=$LDFLAGS" -framework Jack"
! 	MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
! 	SYSSRC=$SYSSRC" s_audio_jack.c"
      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"
!     LDFLAGS=$LDFLAGS" -lrt -ljack"
! fi
! if test x$jack == "xrun";
! then
!     MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"
!     SYSSRC=$SYSSRC" s_audio_jack.c"
!     LDFLAGS=$LDFLAGS" -lrt -ljack"
  fi
  
--- 259,287 ----
          -I../../Frameworks/Tcl.framework/Versions/Current/Headers \
          -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders"
!         
!     if test x$USE_DEBUG == "xyes"; then
!         OPT_CFLAGS="-g"
      else
!         OPT_CFLAGS="-O3"
      fi
+     
      OSNUMBER=2
      EXTERNTARGET=pd_darwin
!     
!     dnl Set processor flags
!     if test "$optimize" == "G3"; then
!         OPT_CFLAGS=$OPT_CFLAGS" -mtune=G3 -mcpu=G3 -malign-natural"
      fi
!     if test "$optimize" == "G4"; then
!         OPT_CFLAGS=$OPT_CFLAGS" -mtune=G4 -mcpu=G4 -maltivec -malign-natural"
!     fi
!     if test "$optimize" == "G5"; then
!         OPT_CFLAGS=$OPT_CFLAGS" -march=G5 -cpu=G5 -maltivec -malign-natural"
!     fi	       
  
!     dnl Enable SIMD instructions
!     if test "$simdcode" == "yes"; then
!         OPT_CFLAGS=$OPT_CFLAGS" -faltivec"
!     fi	
  fi
  
***************
*** 287,290 ****
--- 298,305 ----
  fi
  
+ dnl test for xmmintrin.h header file
+ CFLAGS=$OPT_CFLAGS
+ AC_TRY_COMPILE([#]include "xmmintrin.h", ,MORECFLAGS=$MORECFLAGS" -DDAZ",)
+ 
  AC_OUTPUT(makefile)
  





More information about the Pd-cvs mailing list