96 lines
1.5 KiB
Text
96 lines
1.5 KiB
Text
--- configure.orig Wed Dec 5 12:06:55 2007
|
|
+++ configure Mon Jan 14 11:22:05 2008
|
|
@@ -19096,55 +19096,9 @@
|
|
|
|
|
|
|
|
-# This can be used to rebuild libtool when needed
|
|
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
|
-
|
|
-# Always use our own libtool.
|
|
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
-
|
|
-# Prevent multiple expansion
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-#
|
|
-# libtool stuff
|
|
-#
|
|
-if test -z "${LTFLAGS}"; then
|
|
- LTFLAGS="--silent"
|
|
-fi
|
|
-
|
|
-LIBTOOL_SCRIPT="`pwd`/libtool"
|
|
-LIBTOOL="${LIBTOOL_SCRIPT} ${LTFLAGS}"
|
|
-libtoolversion=`${SHELL} ${LIBTOOL_SCRIPT} --version`
|
|
-case $libtoolversion in
|
|
- *1.4*)
|
|
- SH_LIBTOOL="${LIBTOOL_SCRIPT}"
|
|
- SHLTCFLAGS="-prefer-pic"
|
|
- LTCFLAGS="-prefer-non-pic -static"
|
|
- ;;
|
|
- *)
|
|
- SH_LIBTOOL="${SHELL} ${LIBTOOL_SCRIPT} ${LTFLAGS}"
|
|
- SHLTCFLAGS=""
|
|
- LTCFLAGS=""
|
|
- ;;
|
|
-esac
|
|
+SH_LIBTOOL="${SHELL} ${LIBTOOL}"
|
|
+SHLTCFLAGS=""
|
|
+LTCFLAGS=""
|
|
|
|
|
|
|
|
@@ -19903,33 +19857,8 @@
|
|
PROXY_LIBS='-lnsl -lsocket -lthread'
|
|
;;
|
|
|
|
- *freebsd*5*)
|
|
- PROXY_LIBS='-lpthread'
|
|
- jni_os=freebsd
|
|
-
|
|
- tmp=`ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libc_r`
|
|
- tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libpthread`
|
|
- tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libthr`
|
|
-
|
|
- case "$tmp" in
|
|
- 100)
|
|
- PROXY_LIBS='-lc_r';
|
|
- ;;
|
|
- 010)
|
|
- PROXY_LIBS='-lpthread';
|
|
- ;;
|
|
- 001)
|
|
- PROXY_LIBS='-lthr';
|
|
- ;;
|
|
- *)
|
|
- PROXY_LIBS='-lpthread'
|
|
- echo "Using -lpthread as default"
|
|
- ;;
|
|
- esac
|
|
- ;;
|
|
-
|
|
*freebsd*)
|
|
- PROXY_LIBS='-lc_r'
|
|
+ PROXY_LIBS="${PTHREAD_LIBS}"
|
|
jni_os=freebsd
|
|
;;
|
|
|