$FreeBSD$

--- configure.orig	Sun Mar 17 15:24:47 2002
+++ configure	Sun Mar 17 15:25:13 2002
@@ -5953,7 +5953,7 @@
 VFS_GNOME_LIBS="`gnome-config --libs gnome`"
 VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`"
 VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`"
-VFS_GLIB_CONFIG="glib-config"
+VFS_GLIB_CONFIG="$GLIB_CONFIG"
 
 
 
@@ -9856,8 +9856,8 @@
   done
 fi
 
-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
-echo "configure:9861: checking for bzCompressInit in -lbz2" >&5
+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
+echo "configure:9861: checking for BZ2_bzCompressInit in -lbz2" >&5
 ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9870,10 +9870,10 @@
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char bzCompressInit();
+char BZ2_bzCompressInit();
 
 int main() {
-bzCompressInit()
+BZ2_bzCompressInit()
 ; return 0; }
 EOF
 if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -10103,7 +10103,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
 		cat > conftest.$ac_ext <<EOF
 #line 10109 "configure"
 #include "confdefs.h"
@@ -10137,7 +10137,7 @@
 EOF
 
 		msg_openssl="yes"
-		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto -ldl"
+		OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo"
 		
 
 if true; then
@@ -10897,7 +10897,7 @@
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
 s%@cflags_set@%$cflags_set%g
-s%@PTHREAD_LIB@%$PTHREAD_LIB%g
+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIBS%g
 s%@ALLOCA@%$ALLOCA%g
 s%@USE_NLS@%$USE_NLS%g
 s%@MSGFMT@%$MSGFMT%g