diff options
Diffstat (limited to 'print/gnome-print/patches/patch-aa')
| -rw-r--r-- | print/gnome-print/patches/patch-aa | 51 |
1 files changed, 45 insertions, 6 deletions
diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa index d71817ed6d1..dea76214298 100644 --- a/print/gnome-print/patches/patch-aa +++ b/print/gnome-print/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2000/05/19 16:19:46 rh Exp $ +$NetBSD: patch-aa,v 1.8 2000/10/15 17:35:30 rh Exp $ ---- configure.orig Fri May 5 07:48:41 2000 -+++ configure Fri May 19 18:02:30 2000 -@@ -2903,7 +2903,7 @@ +--- configure.orig Wed Sep 20 00:32:19 2000 ++++ configure +@@ -2906,7 +2906,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS" +LIBS="`xml-config --libs` ${LIBS}" cat > conftest.$ac_ext <<EOF - #line 2909 "configure" + #line 2912 "configure" #include "confdefs.h" -@@ -2933,7 +2933,8 @@ +@@ -2936,7 +2936,8 @@ echo "$ac_t""yes" 1>&6 @@ -21,3 +21,42 @@ $NetBSD: patch-aa,v 1.7 2000/05/19 16:19:46 rh Exp $ else echo "$ac_t""no" 1>&6 +@@ -4906,8 +4907,7 @@ + + echo $ac_n "checking for libunicode >= 0.4""... $ac_c" 1>&6 + echo "configure:4909: checking for libunicode >= 0.4" >&5 +-vers=`gnome-config --modversion unicode | sed -e "s/unicode-//" | \ +- awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'` ++vers=4 + if test "$vers" -ge 4; then + echo "$ac_t""found" 1>&6 + else +@@ -5041,23 +5041,23 @@ + PRINT_INCLUDEDIR='-I${includedir}' + PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui`" + PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `xml-config --cflags`" +-PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui gdk_pixbuf unicode`" ++PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_LIBS="$PRINT_LIBS `xml-config --libs`" + + + + +-PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf unicode` ++PRINT_TEST_CFLAGS="`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf`" + PRINT_TEST_CFLAGS="$PRINT_TEST_CFLAGS `xml-config --cflags`" +-PRINT_TEST_LIBS=`$GNOME_CONFIG --libs gnomeui gdk_pixbuf unicode` ++PRINT_TEST_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_TEST_LIBS="$PRINT_TEST_LIBS `xml-config --libs`" + + + + +-PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf unicode` ++PRINT_TEST_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf` + PRINT_TEST_CFLAGS="$PRINT_TEST_CFLAGS `xml-config --cflags`" +-PRINT_TEST_LIBS=`$GNOME_CONFIG --libs gnomeui gdk_pixbuf unicode` ++PRINT_TEST_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf` -lunicode" + PRINT_TEST_LIBS="$PRINT_TEST_LIBS `xml-config --libs`" + + |