summaryrefslogtreecommitdiff
path: root/x11/libgnome/files/patch-aa
blob: 604dc409f06d21b44733a0bd5e59600e404a4394 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
--- configure.orig	Tue Aug  1 21:58:10 2000
+++ configure	Tue Aug  1 21:59:03 2000
@@ -7214,7 +7214,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 7220 "configure"
 #include "confdefs.h"
@@ -10208,13 +10208,13 @@
 SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
 
 ART_LIBS="-lart_lgpl"
-GNOME_LIBS="-lgnome -lgnomesupport $LIBGNOME_LIBS"
+GNOME_LIBS="-lgnome -lgnomesupport -lintl $LIBGNOME_LIBS"
 GNOMEUI_LIBS="-lgnomeui $ART_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $GNOME_LIBS"
 GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
 ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
 
 GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H'
 GNOME_IDLDIR='-I${datadir}/idl'
 
 
@@ -10609,6 +10609,7 @@
 s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@cflags_set@%$cflags_set%g
+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
@@ -11079,10 +11080,6 @@
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
 
       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.