Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18135
Modified Files: configure.ac Log Message: another attempt to fix the configure for osX
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.ac 18 May 2005 16:50:12 -0000 1.2 --- configure.ac 19 May 2005 10:22:42 -0000 1.3 *************** *** 35,39 **** AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) !
if test $includedir --- 35,42 ---- AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) ! if test `uname -s` = Darwin; ! then ! AC_ARG_ENABLE(bundle, [ --enable-bundleloader use bundle_loader (default: autodetect)]) ! fi
if test $includedir *************** *** 74,83 **** DFLAGS="-DZEXY_LIBRARY"
dnl ! dnl OK, checks for machines are here now dnl if test `uname -s` = Linux; then ! LFLAGS="-export_dynamic -shared" EXT=pd_linux STRIPFLAGS="--strip-unneeded" --- 77,145 ---- DFLAGS="-DZEXY_LIBRARY"
+ + dnl Checks for pd-version, to set the correct help-path + AC_MSG_CHECKING("pd>=0.37") + + if test "$with_pdversion" != "" + then + echo -n "($with_pdversion)... " + PD_VERSION="$with_pdversion" + else + cat > conftest.c << EOF + #include <stdio.h> + #include "m_pd.h" + int main(){ + printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); + return 0; + } + EOF + if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 + then + PD_VERSION=`./conftest.o` + else + PD_VERSION="" + fi + fi + + let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 + let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 + + if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 + then + REFERENCEPATH=extra/help- + echo "yes" + else + REFERENCEPATH=doc/5.reference/ + echo "no" + fi + + dnl check for zexy-version (but why...) + AC_MSG_CHECKING("zexy-version") + cat > conftest.c << EOF + #include <stdio.h> + #include "zexy.h" + int main(){ + printf("%s\n", VERSION); + return 0; + } + EOF + + if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 + then + ZEXY_VERSION=`./conftest.o` + echo "$ZEXY_VERSION" + else + ZEXY_VERSION="X" + echo "(unknown)" + fi + + + dnl ! dnl OK, checks which machines are here now dnl if test `uname -s` = Linux; then ! LFLAGS="-export_dynamic -shared" EXT=pd_linux STRIPFLAGS="--strip-unneeded" *************** *** 101,107 **** then LD=cc - LFLAGS="-bundle -undefined suppress -flat_namespace" EXT=pd_darwin ! STRIPFLAGS= if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); --- 163,187 ---- then LD=cc EXT=pd_darwin ! ! if test "$enable_bundleloader" = ""; then ! if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 39; then ! enable_bundleloader="yes" ! else ! enable_bundleloader="no" ! fi ! fi ! if test "$enable_bundleloader" = "yes"; then ! dnl i hope "prefix" points to where we want it... ! dnl should it rather be @exec_prefix@ ??? ! LFLAGS="-bundle -bundle_loader @prefix@/bin/pd" ! STRIPFLAGS= ! else ! LFLAGS="-bundle -undefined suppress -flat_namespace" ! STRIPFLAGS= ! fi ! ! ! if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); *************** *** 112,115 **** --- 192,196 ---- fi fi + if test `uname | sed -e 's/^MINGW.*/NT/'` = NT; then *************** *** 156,216 **** fi
- dnl Checks for pd-version, to set the correct help-path - AC_MSG_CHECKING("pd>=0.37") - - if test "$with_pdversion" != "" - then - echo -n "($with_pdversion)... " - PD_VERSION="$with_pdversion" - else - cat > conftest.c << EOF - #include <stdio.h> - #include "m_pd.h" - int main(){ - printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); - return 0; - } - EOF - if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 - then - PD_VERSION=`./conftest.o` - else - PD_VERSION="" - fi - fi - - let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 - let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 - - if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 - then - REFERENCEPATH=extra/help- - echo "yes" - else - REFERENCEPATH=doc/5.reference/ - echo "no" - fi - - dnl check for zexy-version (but why...) - AC_MSG_CHECKING("zexy-version") - cat > conftest.c << EOF - #include <stdio.h> - #include "zexy.h" - int main(){ - printf("%s\n", VERSION); - return 0; - } - EOF - - if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 - then - ZEXY_VERSION=`./conftest.o` - echo "$ZEXY_VERSION" - else - ZEXY_VERSION="X" - echo "(unknown)" - fi - - dnl check for LPT AC_MSG_CHECKING("parallel-port") --- 237,240 ----