[PD-cvs] pd/src configure.in,1.1.1.4.2.21,1.1.1.4.2.22 configure,1.1.1.4.2.21,NONE
Thomas Grill
xovo at users.sourceforge.net
Thu Oct 7 22:59:47 CEST 2004
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28223
Modified Files:
Tag: devel_0_37
configure.in
Removed Files:
Tag: devel_0_37
configure
Log Message:
cleaned up configure.in, fixed some bugs, removed configure
--- configure DELETED ---
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.1.1.4.2.21
retrieving revision 1.1.1.4.2.22
diff -C2 -d -r1.1.1.4.2.21 -r1.1.1.4.2.22
*** configure.in 6 Oct 2004 18:41:44 -0000 1.1.1.4.2.21
--- configure.in 7 Oct 2004 20:59:45 -0000 1.1.1.4.2.22
***************
*** 2,14 ****
AC_INIT(d_arithmetic.c)
- AC_SUBST(alsa, yes)
- AC_SUBST(jack, no)
- AC_SUBST(portaudio, no)
- AC_SUBST(fftw, no)
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,9 ----
***************
*** 23,46 ****
dnl check for features
! AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA],
! alsa=$enableval)
! 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",USE_OPT_CFLAGS="yes")
! AC_ARG_ENABLE(static, [ --enable-static link statically],
! static=yes)
! AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support],
! fftw="yes",fftw="no")
! AC_ARG_ENABLE(icc, [ --enable-icc icc support],icc=$enableval,icc="no")
! 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)
! AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler (EXPERIMENTAL, implies --enable-gathreadlocks)],threadedsf=$enableval)
! AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)],gathreadlocks=$enableval)
dnl Checks for programs.
! if test "$icc" = "yes";
then
AC_CHECK_PROG(icc,icc,export CC=icc)
--- 18,41 ----
dnl check for features
! AC_ARG_ENABLE(alsa, [ --enable-alsa enable ALSA (default=yes)],
! alsa=$enableval,alsa=yes)
! AC_ARG_ENABLE(jack, [ --enable-jack jack audio server (default=no)],
! jack=$enableval,jack=no)
! AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio (default=no)],
! portaudio=$enableval,portaudio=no)
! AC_ARG_ENABLE(debug, [ --enable-debug debugging support (default=no)],
! USE_DEBUG=$enableval,USE_DEBUG=no)
! AC_ARG_ENABLE(static, [ --enable-static link statically (default=no)],
! static=$enableval,static=no)
! AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support (default=no)],fftw=$enableval,fftw=no)
! AC_ARG_ENABLE(icc, [ --enable-icc icc support (default=no)],icc=$enableval,icc=no)
! AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3, G4, G5],optimize=$enableval,optimize=no)
! AC_ARG_ENABLE(simd, [ --enable-simd use SIMD code (default=no)],simdcode=$enableval,simdcode=no)
! AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch (default=no)],threadedgui=$enableval,threadedgui=no)
! AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler (EXPERIMENTAL, implies --enable-gathreadlocks)],threadedsf=$enableval,threadedsf=no)
! AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)],gathreadlocks=$enableval,gathreadlocks=no)
dnl Checks for programs.
! if test "$icc" == "yes";
then
AC_CHECK_PROG(icc,icc,export CC=icc)
***************
*** 124,129 ****
! if test `uname -s` = Linux;
then
dnl Checking for ALSA
--- 119,144 ----
+ if test "$fftw" == "yes"; then
+ MORECFLAGS=$MORECFLAGS" -DUSE_FFTW"
+ fi
+
+ if test "$threadedgui" == "yes"; then
+ MORECFLAGS=$MORECFLAGS" -DTHREADED_GUI"
+ fi
+
+ if test "$threadedsf" == "yes"; then
+ MORECFLAGS=$MORECFLAGS" -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE"
+ fi
+
+ if test "$gathreadlocks" == "yes"; then
+ MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE"
+ fi
+
+ if test "$simdcode" != "yes"; then
+ MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD"
+ fi
+
! if test `uname -s` == Linux;
then
dnl Checking for ALSA
***************
*** 137,141 ****
dnl Checking for JACK
! if test "$jack" = "yes"; then
AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt")
AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no)
--- 152,156 ----
dnl Checking for JACK
! if test "$jack" == "yes"; then
AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt")
AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no)
***************
*** 144,174 ****
dnl Checking for FFTW3
! if test "$fftw" = "yes"; then
AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d,PDLIB="$PDLIB -lfftw3f"; fftw=yes,fftw=no)
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="-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
LDFLAGS="$LDFLAGS -static"
fi
EXT=pd_linux
! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN \
-DUSEAPI_OSS \
-I../portaudio/pa_common \
--- 159,195 ----
dnl Checking for FFTW3
! if test "$fftw" == "yes"; then
AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d,PDLIB="$PDLIB -lfftw3f"; fftw=yes,fftw=no)
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"
! fi
! if test "$optimize" == "pentium"; then
! ARCH_CFLAGS="-mtune=pentium -march=pentium"
fi
fi
LDFLAGS="-Wl,-export-dynamic"
! if test "$static" == "yes"; then
LDFLAGS="$LDFLAGS -static"
fi
EXT=pd_linux
! MORECFLAGS=$MORECFLAGS" -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN \
-DUSEAPI_OSS \
-I../portaudio/pa_common \
***************
*** 177,200 ****
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 "$threadedsf" == "yes";
- then
- MORECFLAGS=$MORECFLAGS" -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE"
- fi
-
- if test "$gathreadlocks" == "yes";
- then
- MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE"
- fi
-
if test x$alsa == "xyes";
then
--- 198,201 ----
***************
*** 206,210 ****
if test x$portaudio == "xyes";
then
! MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS
SYSSRC="s_audio_pa.c \
../portaudio/pa_common/pa_allocation.c \
--- 207,211 ----
if test x$portaudio == "xyes";
then
! MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO "$MORECFLAGS
SYSSRC="s_audio_pa.c \
../portaudio/pa_common/pa_allocation.c \
***************
*** 234,253 ****
STRIPFLAG=-s
GUINAME="pd-gui"
! 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
--- 235,251 ----
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" -O6 -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
***************
*** 270,274 ****
fi
! if test `uname -s` = Darwin;
then
LDFLAGS="-Wl -framework Tcl -framework CoreAudio \
--- 268,272 ----
fi
! if test `uname -s` == Darwin;
then
LDFLAGS="-Wl -framework Tcl -framework CoreAudio \
***************
*** 276,280 ****
-framework Carbon -framework CoreMIDI"
EXT=pd_darwin
! MORECFLAGS="-DMACOSX -I/usr/X11R6/include \
-I../portaudio/pa_common \
-I../portaudio/pablio \
--- 274,278 ----
-framework Carbon -framework CoreMIDI"
EXT=pd_darwin
! MORECFLAGS=$MORECFLAGS" -DMACOSX -I/usr/X11R6/include \
-I../portaudio/pa_common \
-I../portaudio/pablio \
***************
*** 300,311 ****
-I/Library/Frameworks/Tcl.framework/Versions/Current/Headers \
-I/Library/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
--- 298,311 ----
-I/Library/Frameworks/Tcl.framework/Versions/Current/Headers \
-I/Library/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
+
if test x$jack == "xyes";
then
***************
*** 314,317 ****
--- 314,333 ----
SYSSRC=$SYSSRC" s_audio_jack.c"
fi
+
+ 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
More information about the Pd-cvs
mailing list