Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19104
Modified Files: Tag: desiredata configure.in configure Log Message: detect fftw3; weak_framework for jack on osx
Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14.2.3 retrieving revision 1.6.2.14.2.4 diff -C2 -d -r1.6.2.14.2.3 -r1.6.2.14.2.4 *** configure 6 Dec 2006 03:48:37 -0000 1.6.2.14.2.3 --- configure 8 Dec 2006 03:37:23 -0000 1.6.2.14.2.4 *************** *** 310,314 **** #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET LIBSUFFIX LDSOFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files=''
--- 310,314 ---- #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi fftw MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET LIBSUFFIX LDSOFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files=''
*************** *** 848,851 **** --- 848,852 ---- --enable-debug debugging support --enable-static link statically + --enable-fftw use FFTW package
Some influential environment variables: *************** *** 1306,1309 **** --- 1307,1312 ---- portmidi=yes
+ fftw=yes +
*************** *** 1353,1356 **** --- 1356,1364 ---- static=$enableval fi; + # Check whether --enable-fftw or --disable-fftw was given. + if test "${enable_fftw+set}" = set; then + enableval="$enable_fftw" + fftw=$enableval + fi;
ac_ext=c *************** *** 4316,4323 **** EXT=pd_darwin LIBSUFFIX=.dylib ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin fi
--- 4324,4341 ---- EXT=pd_darwin LIBSUFFIX=.dylib ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" # 0.39 ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO -DDL_OPEN" # 0.40 STRIPFLAG="" LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin + ### this comes from pd 0.40 + # if test `uname -r` = 7.9.0; then + # MORECFLAGS=$MORECFLAGS" -DMACOSX3" + # EXTERNTARGET=d_ppc + # else + # MORECFLAGS=$MORECFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" + # EXTERNTARGET=d_fat + # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" + # fi fi
*************** *** 5276,5280 **** fi if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" else LIBS="$LIBS -ljack" --- 5294,5299 ---- fi if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" # 0.39 ! LDFLAGS=$LDFLAGS" -weak_framework Jack" # 0.40 else LIBS="$LIBS -ljack" *************** *** 5303,5306 **** --- 5322,5397 ---- MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
+ if test x$fftw == "xyes"; then + echo "$as_me:$LINENO: checking for fftwf_forget_wisdom in -lfftw3f" >&5 + echo $ECHO_N "checking for fftwf_forget_wisdom in -lfftw3f... $ECHO_C" >&6 + if test "${ac_cv_lib_fftw3f_fftwf_forget_wisdom_+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lfftw3f $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char fftwf_forget_wisdom (); + int + main () + { + fftwf_forget_wisdom (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: "$ac_link"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_fftw3f_fftwf_forget_wisdom_=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_fftw3f_fftwf_forget_wisdom_=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3f_fftwf_forget_wisdom_" >&5 + echo "${ECHO_T}$ac_cv_lib_fftw3f_fftwf_forget_wisdom_" >&6 + if test $ac_cv_lib_fftw3f_fftwf_forget_wisdom_ = yes; then + LDFLAGS=$LDFLAGS" -lfftw3f" + else + fftw=no + fi + + fi + ac_config_files="$ac_config_files makefile" cat >confcache <<_ACEOF *************** *** 5944,5947 **** --- 6035,6039 ---- s,@portaudio@,$portaudio,;t t s,@portmidi@,$portmidi,;t t + s,@fftw@,$fftw,;t t s,@MORECFLAGS@,$MORECFLAGS,;t t s,@EXT@,$EXT,;t t
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.5 retrieving revision 1.5.4.5.2.16.2.6 diff -C2 -d -r1.5.4.5.2.16.2.5 -r1.5.4.5.2.16.2.6 *** configure.in 6 Dec 2006 03:46:22 -0000 1.5.4.5.2.16.2.5 --- configure.in 8 Dec 2006 03:37:23 -0000 1.5.4.5.2.16.2.6 *************** *** 12,15 **** --- 12,16 ---- AC_SUBST(portaudio, yes) AC_SUBST(portmidi, yes) + AC_SUBST(fftw, yes) AC_SUBST(MORECFLAGS) AC_SUBST(EXT) *************** *** 31,34 **** --- 32,36 ---- AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_DEBUG_CFLAGS=$enableval) AC_ARG_ENABLE(static, [ --enable-static link statically], static=$enableval) + AC_ARG_ENABLE(fftw, [ --enable-fftw use FFTW package], fftw=$enableval)
dnl Checks for programs. *************** *** 72,79 **** EXT=pd_darwin LIBSUFFIX=.dylib ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin fi
--- 74,91 ---- EXT=pd_darwin LIBSUFFIX=.dylib ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" # 0.39 ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO -DDL_OPEN" # 0.40 STRIPFLAG="" LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin + ### this comes from pd 0.40 + # if test `uname -r` = 7.9.0; then + # MORECFLAGS=$MORECFLAGS" -DMACOSX3" + # EXTERNTARGET=d_ppc + # else + # MORECFLAGS=$MORECFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" + # EXTERNTARGET=d_fat + # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" + # fi fi
*************** *** 154,158 **** fi if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" else LIBS="$LIBS -ljack" --- 166,171 ---- fi if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" # 0.39 ! LDFLAGS=$LDFLAGS" -weak_framework Jack" # 0.40 else LIBS="$LIBS -ljack" *************** *** 181,184 **** --- 194,201 ---- MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
+ if test x$fftw == "xyes"; then + AC_CHECK_LIB(fftw3f, fftwf_forget_wisdom ,LDFLAGS=$LDFLAGS" -lfftw3f",fftw=no) + fi + AC_OUTPUT(makefile)