diff options
Diffstat (limited to 'devel/gnome-vfs/files/patch-configure')
| -rw-r--r-- | devel/gnome-vfs/files/patch-configure | 53 |
1 files changed, 18 insertions, 35 deletions
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure index 7865fc3fbb2c..e44e93476014 100644 --- a/devel/gnome-vfs/files/patch-configure +++ b/devel/gnome-vfs/files/patch-configure @@ -1,54 +1,37 @@ ---- configure.orig 2009-10-10 11:55:11.000000000 -0400 -+++ configure 2009-10-10 11:55:14.000000000 -0400 -@@ -8433,7 +8433,7 @@ fi - +--- configure.orig 2010-09-29 07:03:15.000000000 +0000 ++++ configure 2010-09-29 07:09:42.000000000 +0000 +@@ -8424,7 +8424,7 @@ + # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h sys/sysmacros.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES... - if test "${am_cv_val_LC_MESSAGES+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -14911,6 +14913,7 @@ fi - rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 - $as_echo "$am_cv_val_LC_MESSAGES" >&6; } -@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'} + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +@@ -14465,6 +14465,7 @@ cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + #define HAVE_NGETTEXT 1 _ACEOF + LIBS="-lintl $LIBS" have_ngettext=yes else - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +@@ -17694,7 +17695,7 @@ $as_echo_n "(cached) " >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17824,7 +17825,7 @@ $as_echo_n "(cached) " >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + |