externals/zexy/src configure.ac,1.19,1.20 - Pd-cvs

28 Sep 2006


      Update of /cvsroot/pure-data/externals/zexy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26269
Modified Files:
    configure.ac 
Log Message:
hopefully a bit better checks (needs some more testing)
Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.ac	6 Jun 2006 12:28:04 -0000	1.19
--- configure.ac	28 Sep 2006 09:52:48 -0000	1.20
***************
*** 32,40 ****
  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
- 
  AC_ARG_ENABLE(library,[  --disable-library       split the library into single externals])
--- 32,35 ----
***************
*** 51,58 ****
  fi
- if test "x" = "x${enable_bundle}" ; then
-  enable_bundle="${with_bundle}"
- fi
- 
  if test "xno" != "x${enable_library}" ; then
  dnl LATER: find a more generic way to generate the .._LIBRARY define
--- 46,49 ----
***************
*** 94,98 ****
   fi
   if test -d "${with_pd}/bin"; then
!   LIBS="-L${with_pd}/bin ${LIBS}"
   fi
  fi
--- 85,89 ----
   fi
   if test -d "${with_pd}/bin"; then
!   LFLAGS="-L${with_pd}/bin ${LFLAGS}"
   fi
  fi
***************
*** 109,113 ****
   for id in $libdir
   do
!   if test -d $id; then LIBS="-L$id $LIBS"; fi
   done
  fi
--- 100,104 ----
   for id in $libdir
   do
!   if test -d $id; then LFLAGS="-L$id $LFLAGS"; fi
   done
  fi
***************
*** 259,263 ****
    if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1
    then
!    LIBRARY_VERSION=`./conftest.o`
     echo "$LIBRARY_VERSION"
    else
--- 250,254 ----
    if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1
    then
!    LIBRARY_VERSION=$(./conftest.o)
     echo "$LIBRARY_VERSION"
    else
***************
*** 276,283 ****
  dnl this needs some rethinking when cross-compiling (?)
  dnl
if test `uname -s` = Linux; 
  then
-   LFLAGS="-export_dynamic -shared"
    EXT=pd_linux	
    STRIPFLAGS="--strip-unneeded"
--- 267,274 ----
  dnl this needs some rethinking when cross-compiling (?)
  dnl
+ AC_CHECK_LDFLAGS([-export_dynamic -shared])
if test `uname -s` = Linux; 
  then
    EXT=pd_linux	
    STRIPFLAGS="--strip-unneeded"
***************
*** 289,296 ****
    then
      LD=$CC
!     LFLAGS="-ip -ipo_obj "$LFLAGS
!     CFLAGS="-ip -ipo_obj "$CFLAGS
!   else
!     :
    fi
  fi
--- 280,285 ----
    then
      LD=$CC
!     AC_CHECK_LDFLAGS([-ip -ipo_obj])
!     AC_CHECK_CFLAGS([-ip -ipo_obj])
    fi
  fi
***************
*** 300,324 ****
  if test `uname -s` = Darwin; 
  then
!   LD=cc
    EXT=pd_darwin
    STRIP="echo faking strip"
    STRIPFLAGS=
-   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"
-   else
-     LFLAGS="-bundle -undefined suppress -flat_namespace"
-   fi
-     
- 
    if test "$enable_lpt" = "yes"; then
      AC_MSG_ERROR("lpt not supported on this platform");
--- 289,297 ----
  if test `uname -s` = Darwin; 
  then
!   LD=${CC}
    EXT=pd_darwin
    STRIP="echo faking strip"
    STRIPFLAGS=
if test "$enable_lpt" = "yes"; then
      AC_MSG_ERROR("lpt not supported on this platform");
***************
*** 330,349 ****
  fi
if test `uname | sed -e 's/^MINGW.*/NT/'` = NT ; 
  then
!   LD=gcc
!   INCLUDES="-I@prefix@/src"
! dnl mingw should (does?) define __WIN32__ which is now used
! dnl  DFLAGS="-DMSW -DNT"
!   LFLAGS="-shared @prefix@/bin/pd.dll"
    EXT=dll
  else
    PDLIBDIR="/lib/pd"
  dnl this is handled by AC_CHECK_LIB above
- dnl  LIBS="-lc -lm"
  fi
  if test `uname -s` = IRIX64; 
  then
!   LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
    -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
          -shared -rdata_shared"
--- 303,331 ----
  fi
+ AC_CHECK_LDFLAGS([-dynamiclib -mmacosx-version-min=10.3 -undefined dynamic_lookup],
+                   ,
+ 	          AC_CHECK_LDFLAGS([-bundle -undefined suppress -flat_namespace])
+                  )
+ 
  if test `uname | sed -e 's/^MINGW.*/NT/'` = NT ; 
  then
!   LD=${CC}
!   LDFLAGS="-shared pd.dll"
    EXT=dll
  else
    PDLIBDIR="/lib/pd"
  dnl this is handled by AC_CHECK_LIB above
  fi
+ 
+ AC_CHECK_LDFLAGS([-shared pd.dll])
+ 
+ 
+ 
+ 
+ 
+ 
  if test `uname -s` = IRIX64; 
  then
!   LDFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
    -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
          -shared -rdata_shared"
***************
*** 362,366 ****
  if test `uname -s` = IRIX32; 
  then
!   LFLAGS="-o32 -DUNIX -DIRIX -O2 
           -shared -rdata_shared"
    EXT=pd_irix5
--- 344,348 ----
  if test `uname -s` = IRIX32; 
  then
!   LDFLAGS="-o32 -DUNIX -DIRIX -O2 
           -shared -rdata_shared"
    EXT=pd_irix5
***************
*** 429,432 ****
--- 411,416 ----
          "--includedir=</path/to/pd/src/>"]))
+ LFLAGS=${LDFLAGS}
+ 
  AC_OUTPUT(Make.config)