diff options
Diffstat (limited to 'x11-fm/nautilus2/files/patch-aa')
| -rw-r--r-- | x11-fm/nautilus2/files/patch-aa | 59 |
1 files changed, 13 insertions, 46 deletions
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 4f01381ab0bb..5c7b55cccce7 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed Jan 31 17:42:11 2001 -+++ configure Wed Jan 31 17:52:50 2001 -@@ -41,9 +41,9 @@ - ac_help="$ac_help - --enable-eazel-services Enable support for Eazel services (default is no)" +--- configure.orig Mon Mar 12 19:48:16 2001 ++++ configure Fri Mar 16 15:02:38 2001 +@@ -45,5 +45,5 @@ ac_help="$ac_help - --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" @@ -13,49 +8,31 @@ $FreeBSD$ - --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help - --with-freetype2-prefix=PATH freetype2 installation prefix" - ac_help="$ac_help -@@ -2789,15 +2789,15 @@ - _found_freetype2="no" - +@@ -3216,4 +3216,4 @@ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. -if test "${with_freetype2_libraries+set}" = set; then - withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval - fi - - +@@ -3223,4 +3223,4 @@ # Check whether --with-freetype2-includes or --without-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval - fi - -@@ -2927,7 +2927,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3354,3 +3354,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2933 "configure" - #include "confdefs.h" -@@ -2967,7 +2967,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3394,3 +3394,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2973 "configure" - #include "confdefs.h" -@@ -2995,10 +2995,10 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -3422,6 +3422,6 @@ echo "$ac_t""yes" 1>&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -64,23 +41,13 @@ $FreeBSD$ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi - - else -@@ -3235,7 +3235,7 @@ - - CC="$_save_cc" +@@ -3662,3 +3662,3 @@ -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3598,7 +3598,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- rpm_libs=-lbz2 -+ rpm_libs="-lrpm -lbz2" - else - echo "$ac_t""no" 1>&6 +@@ -6117,3 +6117,3 @@ + if test x$SCROLLKEEPER_CONFIG = xno; then +- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; } ++ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2 fi |