| 1 | diff -Naur src.old/configure src/configure |
|---|
| 2 | --- src.old/configure 2008-11-25 20:28:41.000000000 -0800 |
|---|
| 3 | +++ src/configure 2009-01-12 07:53:52.000000000 -0800 |
|---|
| 4 | @@ -5,7 +5,7 @@ |
|---|
| 5 | [ -n "$VERSION" ] && echo "Running configure for SHOGUN version $VERSION" |
|---|
| 6 | |
|---|
| 7 | # some hopefully reasonable defaults |
|---|
| 8 | -MAKEDEPEND="gcc -MM" |
|---|
| 9 | +MAKEDEPEND="/opt/local/bin/gcc-mp-4.3 -MM" |
|---|
| 10 | MAKEDEPENDOPTS="" |
|---|
| 11 | SRCDIR="`dirname $0`" |
|---|
| 12 | EXT_SRC_HEADER=h |
|---|
| 13 | @@ -63,7 +63,7 @@ |
|---|
| 14 | _hmmdebug=no |
|---|
| 15 | _pathdebug=no |
|---|
| 16 | _profile=no |
|---|
| 17 | -_prefix="/usr/local" |
|---|
| 18 | +_prefix="/opt/local" |
|---|
| 19 | _destdir="/" |
|---|
| 20 | _bindir="" |
|---|
| 21 | _datadir="" |
|---|
| 22 | @@ -385,8 +385,8 @@ |
|---|
| 23 | if test -f "$TMPO" |
|---|
| 24 | then |
|---|
| 25 | echo >> "$TMPLOG" |
|---|
| 26 | - echo "ldd $TMPO" >> "$TMPLOG" |
|---|
| 27 | - ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1 |
|---|
| 28 | + echo "otool -L $TMPO" >> "$TMPLOG" |
|---|
| 29 | + ( otool -L "$TMPO" ) >> "$TMPLOG" 2>&1 |
|---|
| 30 | else |
|---|
| 31 | echo "no object file created" >> "$TMPLOG" |
|---|
| 32 | fi |
|---|
| 33 | @@ -405,8 +405,8 @@ |
|---|
| 34 | if test -f "$TMPO" |
|---|
| 35 | then |
|---|
| 36 | echo >> "$TMPLOG" |
|---|
| 37 | - echo "ldd $TMPO" >> "$TMPLOG" |
|---|
| 38 | - ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1 |
|---|
| 39 | + echo "otool -L $TMPO" >> "$TMPLOG" |
|---|
| 40 | + ( otool -L "$TMPO" ) >> "$TMPLOG" 2>&1 |
|---|
| 41 | else |
|---|
| 42 | echo "no object file created" >> "$TMPLOG" |
|---|
| 43 | fi |
|---|
| 44 | @@ -2391,7 +2391,7 @@ |
|---|
| 45 | LINKFLAGS="-bundle -Wl,-flat_namespace -L`octave-config -p OCTLIBDIR` -loctinterp -loctave -lcruft $LINKFLAGS" |
|---|
| 46 | else |
|---|
| 47 | OCTLIBDIR=`octave-config -p OCTLIBDIR` |
|---|
| 48 | - LINKFLAGS="-shared -L $OCTLIBDIR -loctinterp -loctave -lcruft $LINKFLAGS" |
|---|
| 49 | + LINKFLAGS="-shared -L$OCTLIBDIR -loctinterp -loctave -lcruft $LINKFLAGS" |
|---|
| 50 | fi |
|---|
| 51 | TARGET="sg.oct" |
|---|
| 52 | INCLUDES="$INCLUDES -I`octave-config -p OCTINCLUDEDIR` -I`octave-config -p INCLUDEDIR`" |
|---|
| 53 | @@ -2667,7 +2667,7 @@ |
|---|
| 54 | } |
|---|
| 55 | EOF |
|---|
| 56 | echocheck "lpsolve Developer Files" |
|---|
| 57 | - LPSOLVELINKFLAGS="-L /usr/lib/lp_solve -llpsolve55" |
|---|
| 58 | + LPSOLVELINKFLAGS="-L/opt/local/lib/ -llpsolve55" |
|---|
| 59 | if cc_check $LPSOLVELINKFLAGS |
|---|
| 60 | then |
|---|
| 61 | echores "yes" |
|---|
