From 44396558c4651b92cd61f3adb7e7e06f811bd522 Mon Sep 17 00:00:00 2001
From: Bryan Jurish <mukau@users.sourceforge.net>
Date: Fri, 23 Jan 2009 10:57:17 +0000
Subject: + yet more autobuild-related updates

svn path=/trunk/externals/moocow/; revision=10603
---
 gfsm/configure    | 53 ++++++++++++++++++++++++++-----------------
 gfsm/configure.ac | 67 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 67 insertions(+), 53 deletions(-)

(limited to 'gfsm')

diff --git a/gfsm/configure b/gfsm/configure
index 387bb3f..2396fd5 100755
--- a/gfsm/configure
+++ b/gfsm/configure
@@ -19971,57 +19971,70 @@ fi
 ## /gfsm:any
 ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
+  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    OFLAGS="-O2 -pipe"
   else
     OFLAGS="-g"
   fi
-  DFLAGS="$DFLAGS -DPIC"
   OFLAGS="$OFLAGS -fPIC"
+  DFLAGS="$DFLAGS -DPIC"
   PDEXT=pd_linux
 fi
 
+##-- MacOSX (darwin)
+if test `uname -s` = Darwin;
+then
+  LD=cc
+  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
+  DFLAGS="$DFLAGS -DMACOSX"
+  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    OFLAGS="-O2"
+  else
+    OFLAGS="-g"
+  fi
+  PDEXT=pd_darwin
+fi
+
+##-- alpha
 if test `uname -m` = alpha;
 then
  AFLAGS="-mieee  -mcpu=ev56";
  OFLAGS="$CFLAGS"
 fi
 
+##-- irix64
 if test `uname -s` = IRIX64;
 then
-  LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
 	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
 	-shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix6
 fi
 
+##-- irix32
 if test `uname -s` = IRIX32;
 then
-  LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 CFLAGS="$UCFLAGS"
 CPPFLAGS="$UCPPFLAGS"
diff --git a/gfsm/configure.ac b/gfsm/configure.ac
index 4205094..df756d9 100644
--- a/gfsm/configure.ac
+++ b/gfsm/configure.ac
@@ -213,69 +213,70 @@ fi
 ## /gfsm:any
 ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-dnl --------------------------------------------------------------------
-dnl BEGIN import from pd configure.in
-dnl --------------------------------------------------------------------
-dnl
-dnl machine-dependent variables
-dnl
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
+  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    OFLAGS="-O2 -pipe" 
   else
     OFLAGS="-g"
   fi
-  DFLAGS="$DFLAGS -DPIC"
   OFLAGS="$OFLAGS -fPIC"
-  PDEXT=pd_linux	
+  DFLAGS="$DFLAGS -DPIC"
+  PDEXT=pd_linux
 fi
 
+##-- MacOSX (darwin)
+if test `uname -s` = Darwin;
+then
+  LD=cc
+  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
+  DFLAGS="$DFLAGS -DMACOSX"
+  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    OFLAGS="-O2"
+  else
+    OFLAGS="-g"
+  fi
+  PDEXT=pd_darwin
+fi
+
+##-- alpha
 if test `uname -m` = alpha; 
 then 
  AFLAGS="-mieee  -mcpu=ev56"; 
  OFLAGS="$CFLAGS"
 fi
 
+##-- irix64
 if test `uname -s` = IRIX64; 
 then
-  LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
 	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
 	-shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix6
 fi
 
+##-- irix32
 if test `uname -s` = IRIX32; 
 then
-  LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
-dnl --------------------------------------------------------------------
-dnl END import from pd configure.in
-dnl --------------------------------------------------------------------
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 dnl
 dnl restore user's CFLAGS
-- 
cgit v1.2.1