diff options
Diffstat (limited to 'sprinkler')
| -rwxr-xr-x | sprinkler/configure | 54 | ||||
| -rw-r--r-- | sprinkler/configure.ac | 61 |
2 files changed, 68 insertions, 47 deletions
diff --git a/sprinkler/configure b/sprinkler/configure index 46e212b..9dcef02 100755 --- a/sprinkler/configure +++ b/sprinkler/configure @@ -3571,58 +3571,70 @@ fi -##-------------------------------------------------------------- -## machine-dependent variables -## +##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="-O3 -funroll-loops -fomit-frame-pointer -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 + 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 +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##-- restore user's CFLAGS diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac index b026360..4a68a9c 100644 --- a/sprinkler/configure.ac +++ b/sprinkler/configure.ac @@ -177,61 +177,70 @@ fi AC_SUBST(DEBUG) -##-------------------------------------------------------------- -## machine-dependent variables -## +##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="-O3 -funroll-loops -fomit-frame-pointer -pipe" - OFLAGS="-O2 -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 + 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_linux + 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 +## END machine-dependent variables +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##-- restore user's CFLAGS |