[PD-cvs] pd/src configure.in,1.1.1.4.2.11,1.1.1.4.2.12

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_37
	configure.in 
Log Message:
added icc support and yves' threaded gui patch


Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.1.1.4.2.11
retrieving revision 1.1.1.4.2.12
diff -C2 -d -r1.1.1.4.2.11 -r1.1.1.4.2.12
*** configure.in	11 Mar 2004 15:50:26 -0000	1.1.1.4.2.11
--- configure.in	31 Mar 2004 13:15:46 -0000	1.1.1.4.2.12
***************
*** 17,20 ****
--- 17,21 ----
  AC_SUBST(OSNUMBER)
  AC_SUBST(EXTERNTARGET)
+ AC_SUBST(CC,gcc)
  
  dnl other defaults
***************
*** 34,41 ****
  AC_ARG_ENABLE(fftw,   [  --enable-fftw           fftw3 support],
      fftw="yes",fftw="no")
! 
  
  dnl Checks for programs.
! AC_PROG_CC
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
--- 35,51 ----
  AC_ARG_ENABLE(fftw,   [  --enable-fftw           fftw3 support],
      fftw="yes",fftw="no")
! AC_ARG_ENABLE(icc,   [  --enable-icc            icc support],icc=$enableval)
! AC_ARG_ENABLE(optimize,   [  --enable-optimize            enables optimized builds for: pentium4, pentium3],optimize=$enableval)
! AC_ARG_ENABLE(threadedgui,   [  --enable-threadedgui    use yves degoyon's threaded gui patch],threadedgui=$enableval)
  
  dnl Checks for programs.
! if test "$icc" = "yes";
! then
!    AC_CHECK_PROG(icc,icc,export CC=icc)
!    CC=icc
! else
!    AC_PROG_CC
! fi
! 
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
***************
*** 53,57 ****
  
  dnl Checks for library functions.
! AC_PROG_GCC_TRADITIONAL
  AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
--- 63,70 ----
  
  dnl Checks for library functions.
! if test "$icc" = "no";
! then
!     AC_PROG_GCC_TRADITIONAL
! fi
  AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
***************
*** 64,70 ****
                   echo "dynamic link support required" || exit 1)
  
! 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
--- 77,86 ----
                   echo "dynamic link support required" || exit 1)
  
!    dnl Checking for `sin' function in -lm:
!    dnl we won't need the math library for icc, since it's using it's own - TB
! if test "$icc" = "no"; then
!    AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm",
!                 echo "math library required" || exit 1)
! fi
  
  dnl Checking for `pthread_create' function in -pthread
***************
*** 130,133 ****
--- 146,167 ----
      fi
  
+     dnl Set processor flags
+     if test "$icc" = "yes"; then
+        if test "$optimize" = "pentium4"; then
+ 	  ARCH_CFLAGS="-xN"
+        fi
+        if test "$optimize" = "pentium3"; then
+ 	  ARCH_CFLAGS="-xK"
+        fi
+     else
+        if test "$optimize" == "pentium4"; then
+ 	  ARCH_CFLAGS="-march=pentium4 -mmmx -msse -msse2 -mfpmath=sse"
+        fi
+        if test "$optimize" == "pentium3"; then
+ 	  ARCH_CFLAGS="-march=pentium3"
+        fi
+     fi	       
+ 
+ 
      LDFLAGS="-Wl,-export-dynamic"
      if test "$static" = "yes"; then 
***************
*** 142,150 ****
      SYSSRC="s_midi_oss.c s_audio_oss.c"
  
!     if test "$fftw" = "yes"; 
      then   
          MORECFLAGS=$MORECFLAGS" -DUSE_FFTW"
      fi	   
  
  
      if test x$alsa == "xyes";
--- 176,189 ----
      SYSSRC="s_midi_oss.c s_audio_oss.c"
  
!     if test "$fftw" == "yes"; 
      then   
          MORECFLAGS=$MORECFLAGS" -DUSE_FFTW"
      fi	   
  
+     if test "$threadedgui" == "yes"; 
+     then   
+         MORECFLAGS=$MORECFLAGS" -DTHREADED_GUI"
+     fi	   
+ 
  
      if test x$alsa == "xyes";
***************
*** 154,157 ****
--- 193,197 ----
  	LDFLAGS=$LDFLAGS" -lasound"
      fi
+ 
      if test x$portaudio == "xyes";
      then
***************
*** 186,193 ****
      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
--- 226,247 ----
      if test x$USE_OPT_CFLAGS == "xyes";
      then
!         if test "$icc" = "yes";
!         then
! 	    OPT_CFLAGS=$ARCH_CFLAGS" -O3"
! 	else
! 	    OPT_CFLAGS=$ARCH_CFLAGS" -O6 -funroll-loops -fomit-frame-pointer"
! 	fi
      else
  	OPT_CFLAGS="-g"
      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