| 1 | --- dist/configure.orig 2001-07-13 09:34:11.000000000 +0800 |
|---|
| 2 | +++ dist/configure 2004-02-13 06:18:17.000000000 +0800 |
|---|
| 3 | @@ -6550,7 +6550,7 @@ |
|---|
| 4 | ;; |
|---|
| 5 | |
|---|
| 6 | darwin* | rhapsody*) |
|---|
| 7 | - allow_undefined_flag='-undefined suppress' |
|---|
| 8 | + allow_undefined_flag='-flat_namespace -undefined suppress' |
|---|
| 9 | # FIXME: Relying on posixy $() will cause problems for |
|---|
| 10 | # cross-compilation, but unfortunately the echo tests do not |
|---|
| 11 | # yet detect zsh echo's removal of \ escapes. |
|---|
| 12 | @@ -8439,9 +8439,33 @@ |
|---|
| 13 | # Prevent multiple expansion |
|---|
| 14 | |
|---|
| 15 | LIBTOOL="\$(SHELL) ./libtool" |
|---|
| 16 | -SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool` |
|---|
| 17 | SOFLAGS="-rpath \$(libdir)" |
|---|
| 18 | |
|---|
| 19 | +echo "$as_me:8770: checking SOSUFFIX from libtool" >&5 |
|---|
| 20 | +echo $ECHO_N "checking SOSUFFIX from libtool... $ECHO_C" >&6 |
|---|
| 21 | +# $library_names_spec is a snippet of shell that may |
|---|
| 22 | +# defined in terms of $versuffix, $release, $libname. |
|---|
| 23 | +# All we want is to eval it and grab the suffix used |
|---|
| 24 | +# for shared objects. |
|---|
| 25 | +versuffix="" |
|---|
| 26 | +release="" |
|---|
| 27 | +libname=libfoo |
|---|
| 28 | +eval library_names=\"$library_names_spec\" |
|---|
| 29 | +SOSUFFIX=`echo "$library_names" | sed -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'` |
|---|
| 30 | +echo "$as_me:8781: result: $SOSUFFIX" >&5 |
|---|
| 31 | +echo "${ECHO_T}$SOSUFFIX" >&6 |
|---|
| 32 | + |
|---|
| 33 | +if test "$SOSUFFIX" = '' ; then |
|---|
| 34 | + SOSUFFIX=so |
|---|
| 35 | + if test "$enable_shared" = "yes"; then |
|---|
| 36 | + { echo "$as_me:8787: WARNING: libtool may not know about this architecture." >&5 |
|---|
| 37 | +echo "$as_me: WARNING: libtool may not know about this architecture." >&2;} |
|---|
| 38 | + { echo "$as_me:8789: WARNING: assuming .$SOSUFFIX suffix for dynamic libraries." >&5 |
|---|
| 39 | +echo "$as_me: WARNING: assuming .$SOSUFFIX suffix for dynamic libraries." >&2;} |
|---|
| 40 | + fi |
|---|
| 41 | +fi |
|---|
| 42 | + |
|---|
| 43 | + |
|---|
| 44 | SAVE_CC="${MAKEFILE_CC}" |
|---|
| 45 | SAVE_CXX="${MAKEFILE_CXX}" |
|---|
| 46 | MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${SAVE_CC}" |
|---|
| 47 | @@ -8728,7 +8752,7 @@ |
|---|
| 48 | done |
|---|
| 49 | JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` |
|---|
| 50 | case "$host_os" in |
|---|
| 51 | - darwin*) JTOPDIR=`echo "$JTOPDIR" | sed -e s:/[^/]*$::'` |
|---|
| 52 | + darwin*) JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` |
|---|
| 53 | JNIHEADERDIR="$JTOPDIR/Headers";; |
|---|
| 54 | *) JNIHEADERDIR="$JTOPDIR/include";; |
|---|
| 55 | esac |
|---|
