74 lines
1.4 KiB
Text
74 lines
1.4 KiB
Text
--- configure.orig 2012-11-08 21:22:27.000000000 +0100
|
|
+++ configure 2013-02-07 12:28:12.000000000 +0100
|
|
@@ -7585,11 +7585,6 @@
|
|
|
|
|
|
|
|
-# This can be used to rebuild libtool when needed
|
|
-LIBTOOL_DEPS="$ltmain"
|
|
-
|
|
-# Always use our own libtool.
|
|
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
|
|
|
|
|
@@ -11464,29 +11459,9 @@
|
|
# Only expand once:
|
|
|
|
|
|
-#
|
|
-# 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=""
|
|
|
|
|
|
|
|
@@ -12271,26 +12246,6 @@
|
|
*freebsd*)
|
|
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
|
|
;;
|
|
|
|
*darwin*)
|