--- configure.orig	2003-10-09 20:19:54 UTC
+++ configure
@@ -3173,7 +3173,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3230,7 +3229,6 @@
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
 
 fi
 
@@ -4129,8 +4127,10 @@
   on_mach='no';
   on_windows='no' ;;
 *freebsd*)
-  LDFLAGS='-llthread -llgcc_r -L/usr/local/lib' ;
-  CFLAGS='-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads' ;
+  CFLAGS_sav=$CFLAGS ;
+  LDFLAGS_sav=$LDFLAGS ;
+  LDFLAGS="$LDFLAGS_sav %THREAD_LIBS%" ;
+  CFLAGS="$CFLAGS_sav %THREAD_CFLAGS%" ;
   on_unix='yes' ;
   on_mach='no';
   on_windows='no' ;;
@@ -4199,7 +4199,7 @@
 fi
 
 case "$host_cpu" in
-powerpc)
+powerpc*)
   cpu_ppc='yes' ;
   cpu_586='no' ;;
 i*86)
