--- configure.orig	2012-09-03 12:10:16.000000000 -0400
+++ configure	2012-09-19 19:08:48.000000000 -0400
@@ -3626,7 +3626,7 @@
         JAVA_ARCH="sparc"
     ;;
 
-x86_64 )
+x86_64 | amd64 )
     ARCH_DIR="x86_64"
     ARCH_FLAGS="-m64 -D__X86_64__"
     JAVA_ARCH="amd64"
@@ -9731,7 +9731,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="%%PTHREAD_LIBS%% $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9760,7 +9760,7 @@
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="%%PTHREAD_LIBS%% $LIBS"
 
 fi