diff options
Diffstat (limited to 'weightmap')
| -rwxr-xr-x | weightmap/configure | 53 | ||||
| -rw-r--r-- | weightmap/configure.ac | 61 |
2 files changed, 69 insertions, 45 deletions
diff --git a/weightmap/configure b/weightmap/configure index d1db25e..3593de4 100755 --- a/weightmap/configure +++ b/weightmap/configure @@ -3574,56 +3574,71 @@ echo "${ECHO_T}no" >&6; } fi - +##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 + +## END machine-dependent variables +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - if test "$DEBUG" = "no"; then - OFLAGS="-O2" - else - OFLAGS="-g" - fi -fi CFLAGS="$UCFLAGS" CPPFLAGS="$UCPPFLAGS" diff --git a/weightmap/configure.ac b/weightmap/configure.ac index dbbe010..b14144b 100644 --- a/weightmap/configure.ac +++ b/weightmap/configure.ac @@ -142,62 +142,71 @@ else fi AC_SUBST(DEBUG) +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## BEGIN machine-dependent variables - -dnl -dnl machine-dependent variables -dnl 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_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 + +## END machine-dependent variables +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - if test "$DEBUG" = "no"; then - OFLAGS="-O2" - else - OFLAGS="-g" - fi -fi dnl dnl restore user's CFLAGS |