--- ./configure.orig	2012-03-06 10:02:43.000000000 -0800
+++ ./configure	2012-03-06 10:05:45.000000000 -0800
@@ -7030,11 +7030,6 @@
 
 
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
@@ -10610,29 +10605,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=""
 
 
 
@@ -11415,28 +11390,8 @@
 	;;
 
   *freebsd*)
-	PROXY_LIBS='-lpthread'
+	PROXY_LIBS="${PTHREAD_LIBS}"
         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*)