diff options
Diffstat (limited to 'devel/gnome-vfs1/files/patch-aa')
| -rw-r--r-- | devel/gnome-vfs1/files/patch-aa | 53 |
1 files changed, 40 insertions, 13 deletions
diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa index 430f97e1c0d7..858c3c9d85ec 100644 --- a/devel/gnome-vfs1/files/patch-aa +++ b/devel/gnome-vfs1/files/patch-aa @@ -1,29 +1,29 @@ $FreeBSD$ ---- configure.orig Thu Jan 24 10:25:14 2002 -+++ configure Thu Jan 24 10:38:00 2002 -@@ -5949,7 +5949,7 @@ +--- 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_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`" -VFS_GLIB_CONFIG="glib-config" +VFS_GLIB_CONFIG="$GLIB_CONFIG" -@@ -9854,8 +9854,8 @@ +@@ -9856,8 +9856,8 @@ done fi -echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9859: checking for bzCompressInit in -lbz2" >&5 +-echo "configure:9861: checking for bzCompressInit in -lbz2" >&5 +echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9859: checking for BZ2_bzCompressInit in -lbz2" >&5 ++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 -@@ -9868,10 +9868,10 @@ +@@ -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. */ @@ -35,17 +35,17 @@ $FreeBSD$ +BZ2_bzCompressInit() ; return 0; } EOF - if { (eval echo configure:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -10101,7 +10101,7 @@ + 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 10107 "configure" + #line 10109 "configure" #include "confdefs.h" -@@ -10135,7 +10135,7 @@ +@@ -10137,7 +10137,7 @@ EOF msg_openssl="yes" @@ -54,7 +54,34 @@ $FreeBSD$ if true; then -@@ -10594,7 +10594,7 @@ +@@ -10559,14 +10559,14 @@ + # + # Check for libiconv + # +- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 +-echo "configure:10564: checking for libiconv_open in -liconv" >&5 ++ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 ++echo "configure:10564: checking for libiconv_open in -lgiconv" >&5 + ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-lgiconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 10572 "configure" + #include "confdefs.h" +@@ -10606,7 +10606,7 @@ + fi + + if test "x$with_libiconv" = "xyes" ; then +- ICONV_LIBS="-liconv" ++ ICONV_LIBS="-lgiconv" + cat >> confdefs.h <<\EOF + #define USE_LIBICONV 1 + EOF +@@ -10897,7 +10897,7 @@ s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g s%@cflags_set@%$cflags_set%g |