Ticket #2387: patch-configs

File patch-configs, 19.2 KB (added by chris.ridd@…, 19 years ago)

file/patch-configs

Line 
1--- art/art-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
2+++ art/art-sharp.dll.config.in Sun Nov 21 10:40:17 2004
3@@ -1,3 +1,3 @@
4 <configuration>
5-  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
6+  <dllmap dll="art_lgpl" target="@LIBART_DIR@libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
7 </configuration>
8--- atk/atk-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
9+++ atk/atk-sharp.dll.config.in Sun Nov 21 10:48:08 2004
10@@ -1,3 +1,3 @@
11 <configuration>
12-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
13+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
14 </configuration>
15--- gconf/GConf/gconf-sharp.dll.config.in.orig  Sun Nov 21 11:05:17 2004
16+++ gconf/GConf/gconf-sharp.dll.config.in       Sun Nov 21 10:49:36 2004
17@@ -1,3 +1,3 @@
18 <configuration>
19-  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
20+  <dllmap dll="gconf-2" target="@GNOME_DIR@libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
21 </configuration>
22--- gda/gda-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
23+++ gda/gda-sharp.dll.config.in Sun Nov 21 10:50:22 2004
24@@ -1,3 +1,3 @@
25 <configuration>
26-  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
27+  <dllmap dll="gda-2" target="@GNOME_DIR@libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
28 </configuration>
29--- gdk/gdk-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
30+++ gdk/gdk-sharp.dll.config.in Sun Nov 21 10:51:31 2004
31@@ -1,6 +1,6 @@
32 <configuration>
33-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
34-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
35-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
36-  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
37+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
38+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
39+  <dllmap dll="libgdk-win32-2.0-0.dll" target="@GNOME_DIR@libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
40+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="@GNOME_DIR@libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
41 </configuration>
42--- glade/glade-sharp.dll.config.in.orig        Sun Nov 21 11:05:17 2004
43+++ glade/glade-sharp.dll.config.in     Sun Nov 21 10:52:11 2004
44@@ -1,3 +1,3 @@
45 <configuration>
46-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
47+  <dllmap dll="libglade-2.0-0.dll" target="@GLADE_DIR@libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
48 </configuration>
49--- glib/glib-sharp.dll.config.in.orig  Sun Nov 21 11:05:17 2004
50+++ glib/glib-sharp.dll.config.in       Sun Nov 21 10:52:58 2004
51@@ -1,5 +1,5 @@
52 <configuration>
53-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
54-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
55-  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
56+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
57+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
58+  <dllmap dll="libgthread-2.0-0.dll" target="@GLIB_DIR@libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
59 </configuration>
60--- gnome/gnome-sharp.dll.config.in.orig        Sun Nov 21 11:05:17 2004
61+++ gnome/gnome-sharp.dll.config.in     Sun Nov 21 10:54:20 2004
62@@ -1,11 +1,11 @@
63 <configuration>
64-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
65-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
66-  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
67-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
68-  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
69-  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
70-  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
71-  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
72-  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
73+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
74+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
75+  <dllmap dll="libgthread-2.0-0.dll" target="@GLIB_DIR@libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
76+  <dllmap dll="libgtk-win32-2.0-0.dll" Target="@GTK_DIR@libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
77+  <dllmap dll="gnome-2" target="@GNOME_DIR@libgnome-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
78+  <dllmap dll="gnomecanvas-2" target="@GNOME_DIR@libgnomecanvas-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
79+  <dllmap dll="gnomeprint-2-2" target="@GNOME_DIR@libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
80+  <dllmap dll="gnomeprintui-2-2" target="@GNOME_DIR@libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
81+  <dllmap dll="gnomeui-2" target="@GNOME_DIR@libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
82 </configuration>
83--- gnomedb/gnomedb-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
84+++ gnomedb/gnomedb-sharp.dll.config.in Sun Nov 21 10:56:46 2004
85@@ -1,3 +1,3 @@
86 <configuration>
87-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
88+  <dllmap dll="gnomedb-2" target="@GNOMEDB_DIR@libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
89 </configuration>
90--- gtk/gtk-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
91+++ gtk/gtk-sharp.dll.config.in Sun Nov 21 10:57:51 2004
92@@ -1,6 +1,6 @@
93 <configuration>
94-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
95-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
96-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
97-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
98+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
99+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
100+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
101+  <dllmap dll="libgtk-win32-2.0-0.dll" target="@GTK_DIR@libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
102 </configuration>
103--- pango/pango-sharp.dll.config.in.orig        Sun Nov 21 11:05:17 2004
104+++ pango/pango-sharp.dll.config.in     Sun Nov 21 10:58:38 2004
105@@ -1,4 +1,4 @@
106 <configuration>
107-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
108-  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
109+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
110+  <dllmap dll="libpango-1.0-0.dll" target="@PANGO_DIR@libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
111 </configuration>
112--- rsvg/rsvg-sharp.dll.config.in.orig  Sun Nov 21 11:05:17 2004
113+++ rsvg/rsvg-sharp.dll.config.in       Sun Nov 21 10:59:56 2004
114@@ -1,3 +1,3 @@
115 <configuration>
116-  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
117+  <dllmap dll="rsvg-2" target="@RSVG_DIR@librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
118 </configuration>
119--- vte/vte-sharp.dll.config.in.orig    Sun Nov 21 11:05:17 2004
120+++ vte/vte-sharp.dll.config.in Sun Nov 21 11:00:28 2004
121@@ -1,4 +1,4 @@
122 <configuration>
123-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
124-  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
125+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
126+  <dllmap dll="vte" target="@VTE_DIR@libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
127 </configuration>
128--- gtkhtml/gtkhtml-sharp.dll.config.in.orig    Sun Nov 21 17:03:53 2004
129+++ gtkhtml/gtkhtml-sharp.dll.config.in Sun Nov 21 17:02:58 2004
130@@ -1,3 +1,3 @@
131 <configuration>
132-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
133+  <dllmap dll="gtkhtml-3.0" target="@GTKHTML_DIR@libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
134 </configuration>
135--- configure.in.orig   Sun Nov 21 17:11:36 2004
136+++ configure.in        Sun Nov 21 17:12:30 2004
137@@ -108,16 +108,22 @@
138 AC_SUBST(GENERATED_SOURCES)
139 
140 PKG_CHECK_MODULES(GLIB, gobject-2.0)
141+GLIB_DIR="`$PKG_CONFIG --variable=libdir gobject-2.0`/"
142 AC_SUBST(GLIB_CFLAGS)
143 AC_SUBST(GLIB_LIBS)
144+AC_SUBST(GLIB_DIR)
145 
146 PKG_CHECK_MODULES(PANGO, pango)
147+PANGO_DIR="`$PKG_CONFIG --variable=libdir pango`/"
148 AC_SUBST(PANGO_CFLAGS)
149 AC_SUBST(PANGO_LIBS)
150+AC_SUBST(PANGO_DIR)
151 
152 PKG_CHECK_MODULES(GTK, gtk+-2.0)
153+GTK_DIR="`$PKG_CONFIG --variable=libdir gtk+-2.0`/"
154 AC_SUBST(GTK_CFLAGS)
155 AC_SUBST(GTK_LIBS)
156+AC_SUBST(GTK_DIR)
157 
158 PKG_CHECK_MODULES(XML, libxml-2.0)
159 AC_SUBST(XML_CFLAGS)
160@@ -128,40 +134,53 @@
161 GTK_REQUIRED_VERSION=2.2.0
162 
163 PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
164+LIBART_DIR="`$PKG_CONFIG --variable=libdir libart-2.0`/"
165 AC_SUBST(LIBART_CFLAGS)
166 AC_SUBST(LIBART_LIBS)
167+AC_SUBST(LIBART_DIR)
168 
169 PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
170+GNOME_DIR="`$PKG_CONFIG --variable=libdir libgnomecanvas-2.0`/"
171 AC_SUBST(GNOME_CFLAGS)
172 AC_SUBST(GNOME_LIBS)
173+AC_SUBST(GNOME_DIR)
174 
175 GLADE_REQUIRED_VERSION=2.0.0
176 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
177+GLADE_DIR="`$PKG_CONFIG --variable=libdir libglade-2.0`/"
178 AC_SUBST(GLADE_CFLAGS)
179 AC_SUBST(GLADE_LIBS)
180+AC_SUBST(GLADE_DIR)
181 
182 LIBGDA_REQUIRED_VERSION=1.0.0
183 PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no)
184 
185 enable_gnomedb=no
186+GNOMEDB_DIR=
187 if test "x$enable_gnome" = "xyes"; then
188 if test "x$enable_gda" = "xyes"; then
189        PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no)
190+       GNOMEDB_DIR="`$PKG_CONFIG --variable=libdir libgnomedb`/"
191 fi
192 fi
193+AC_SUBST(GNOMEDB_DIR)
194 
195 RSVG_REQUIRED_VERSION=2.0.1
196 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
197+RSVG_DIR="`$PKG_CONFIG --variable=libdir librsvg-2.0`/"
198+AC_SUBST(RSVG_DIR)
199 
200 GTKHTML_REQUIRED_VERSION=3.0.10
201 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
202 if test "x$enable_gtkhtml" = "xyes"; then
203+       GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.0`/"
204        GTKHTML_VERSION=3.0
205        GTKHTML_SOVERSION=4
206 else
207        GTKHTML_REQUIRED_VERSION=3.2.0
208        PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
209        if test "x$enable_gtkhtml" = "xyes"; then
210+               GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.1`/"
211                GTKHTML_VERSION=3.1
212                GTKHTML_SOVERSION=11
213        else
214@@ -169,12 +188,14 @@
215                GTKHTML_SOVERSION=
216        fi
217 fi
218+AC_SUBST(GTKHTML_DIR)
219 AC_SUBST(GTKHTML_VERSION)
220 AC_SUBST(GTKHTML_SOVERSION)
221 
222 VTE_REQUIRED_VERSION=0.11.10
223 PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no)
224-
225+VTE_DIR="`$PKG_CONFIG --variable=libdir vte`/"
226+AC_SUBST(VTE_DIR)
227 AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
228 AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
229 AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
230--- configure.orig      Fri Oct 29 22:22:50 2004
231+++ configure   Sun Nov 21 17:33:10 2004
232@@ -463,7 +463,7 @@
233 # include <unistd.h>
234 #endif"
235 
236-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT API_VERSION CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CC_FOR_BUILD HOST_CC BUILD_EXEEXT CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BUILD_GTK_CFLAGS BUILD_GTK_LIBS MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL GACUTIL_FLAGS LIB_PREFIX LIB_SUFFIX GENERATED_SOURCES GLIB_CFLAGS GLIB_LIBS PANGO_CFLAGS PANGO_LIBS GTK_CFLAGS GTK_LIBS XML_CFLAGS XML_LIBS LIBART_CFLAGS LIBART_LIBS GNOME_CFLAGS GNOME_LIBS GLADE_CFLAGS GLADE_LIBS LIBGDA_DEPENDENCIES_CFLAGS LIBGDA_DEPENDENCIES_LIBS LIBGNOMEDB_DEPENDENCIES_CFLAGS LIBGNOMEDB_DEPENDENCIES_LIBS RSVG_DEPENDENCIES_CFLAGS RSVG_DEPENDENCIES_LIBS GTKHTML_DEPENDENCIES_CFLAGS GTKHTML_DEPENDENCIES_LIBS GTKHTML_VERSION GTKHTML_SOVERSION VTE_DEPENDENCIES_CFLAGS VTE_DEPENDENCIES_LIBS ENABLE_LIBART_TRUE ENABLE_LIBART_FALSE ENABLE_GNOME_TRUE ENABLE_GNOME_FALSE ENABLE_GLADE_TRUE ENABLE_GLADE_FALSE ENABLE_GDA_TRUE ENABLE_GDA_FALSE ENABLE_GNOMEDB_TRUE ENABLE_GNOMEDB_FALSE ENABLE_RSVG_TRUE ENABLE_RSVG_FALSE ENABLE_GTKHTML_TRUE ENABLE_GTKHTML_FALSE ENABLE_VTE_TRUE ENABLE_VTE_FALSE LIBOBJS LTLIBOBJS'
237+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT API_VERSION CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CC_FOR_BUILD HOST_CC BUILD_EXEEXT CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BUILD_GTK_CFLAGS BUILD_GTK_LIBS MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS RUNTIME CSC GACUTIL GACUTIL_FLAGS LIB_PREFIX LIB_SUFFIX GENERATED_SOURCES GLIB_CFLAGS GLIB_LIBS GLIB_DIR PANGO_CFLAGS PANGO_LIBS PANGO_DIR GTK_CFLAGS GTK_LIBS GTK_DIR XML_CFLAGS XML_LIBS LIBART_CFLAGS LIBART_LIBS LIBART_DIR GNOME_CFLAGS GNOME_LIBS GNOME_DIR GLADE_CFLAGS GLADE_LIBS GLADE_DIR LIBGDA_DEPENDENCIES_CFLAGS LIBGDA_DEPENDENCIES_LIBS LIBGNOMEDB_DEPENDENCIES_CFLAGS LIBGNOMEDB_DEPENDENCIES_LIBS GNOMEDB_DIR RSVG_DEPENDENCIES_CFLAGS RSVG_DEPENDENCIES_LIBS RSVG_DIR GTKHTML_DEPENDENCIES_CFLAGS GTKHTML_DEPENDENCIES_LIBS GTKHTML_DIR GTKHTML_VERSION GTKHTML_SOVERSION VTE_DEPENDENCIES_CFLAGS VTE_DEPENDENCIES_LIBS VTE_DIR ENABLE_LIBART_TRUE ENABLE_LIBART_FALSE ENABLE_GNOME_TRUE ENABLE_GNOME_FALSE ENABLE_GLADE_TRUE ENABLE_GLADE_FALSE ENABLE_GDA_TRUE ENABLE_GDA_FALSE ENABLE_GNOMEDB_TRUE ENABLE_GNOMEDB_FALSE ENABLE_RSVG_TRUE ENABLE_RSVG_FALSE ENABLE_GTKHTML_TRUE ENABLE_GTKHTML_FALSE ENABLE_VTE_TRUE ENABLE_VTE_FALSE LIBOBJS LTLIBOBJS'
238 ac_subst_files=''
239 
240 # Initialize some variables set by options.
241@@ -21212,6 +21212,8 @@
242    { (exit 1); exit 1; }; }
243   fi
244 
245+GLIB_DIR="`$PKG_CONFIG --variable=libdir gobject-2.0`/"
246+
247 
248 
249 
250@@ -21313,6 +21315,8 @@
251    { (exit 1); exit 1; }; }
252   fi
253 
254+PANGO_DIR="`$PKG_CONFIG --variable=libdir pango`/"
255+
256 
257 
258 
259@@ -21414,6 +21418,8 @@
260    { (exit 1); exit 1; }; }
261   fi
262 
263+GTK_DIR="`$PKG_CONFIG --variable=libdir gtk+-2.0`/"
264+
265 
266 
267 
268@@ -21618,6 +21624,8 @@
269      enable_libart=no
270   fi
271 
272+LIBART_DIR="`$PKG_CONFIG --variable=libdir libart-2.0`/"
273+
274 
275 
276 
277@@ -21717,6 +21725,8 @@
278      enable_gnome=no
279   fi
280 
281+GNOME_DIR="`$PKG_CONFIG --variable=libdir libgnomecanvas-2.0`/"
282+
283 
284 
285 
286@@ -21817,6 +21827,8 @@
287      enable_glade=no
288   fi
289 
290+GLADE_DIR="`$PKG_CONFIG --variable=libdir libglade-2.0`/"
291+
292 
293 
294 
295@@ -21919,6 +21931,7 @@
296 
297 
298 enable_gnomedb=no
299+GNOMEDB_DIR=
300 if test "x$enable_gnome" = "xyes"; then
301 if test "x$enable_gda" = "xyes"; then
302 
303@@ -22017,9 +22030,11 @@
304      enable_gnomedb=no
305   fi
306 
307+       GNOMEDB_DIR="`$PKG_CONFIG --variable=libdir libgnomedb`/"
308 fi
309 fi
310 
311+
312 RSVG_REQUIRED_VERSION=2.0.1
313 
314   succeeded=no
315@@ -22117,6 +22132,8 @@
316      enable_rsvg=no
317   fi
318 
319+RSVG_DIR="`$PKG_CONFIG --variable=libdir librsvg-2.0`/"
320+
321 
322 GTKHTML_REQUIRED_VERSION=3.0.10
323 
324@@ -22216,6 +22233,7 @@
325   fi
326 
327 if test "x$enable_gtkhtml" = "xyes"; then
328+       GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.0`/"
329        GTKHTML_VERSION=3.0
330        GTKHTML_SOVERSION=4
331 else
332@@ -22317,6 +22335,7 @@
333   fi
334 
335        if test "x$enable_gtkhtml" = "xyes"; then
336+               GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.1`/"
337                GTKHTML_VERSION=3.1
338                GTKHTML_SOVERSION=11
339        else
340@@ -22327,6 +22346,7 @@
341 
342 
343 
344+
345 VTE_REQUIRED_VERSION=0.11.10
346 
347   succeeded=no
348@@ -22424,6 +22444,7 @@
349      enable_vte=no
350   fi
351 
352+VTE_DIR="`$PKG_CONFIG --variable=libdir vte`/"
353 
354 
355 
356@@ -23398,30 +23419,40 @@
357 s,@GENERATED_SOURCES@,$GENERATED_SOURCES,;t t
358 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
359 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
360+s,@GLIB_DIR@,$GLIB_DIR,;t t
361 s,@PANGO_CFLAGS@,$PANGO_CFLAGS,;t t
362 s,@PANGO_LIBS@,$PANGO_LIBS,;t t
363+s,@PANGO_DIR@,$PANGO_DIR,;t t
364 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
365 s,@GTK_LIBS@,$GTK_LIBS,;t t
366+s,@GTK_DIR@,$GTK_DIR,;t t
367 s,@XML_CFLAGS@,$XML_CFLAGS,;t t
368 s,@XML_LIBS@,$XML_LIBS,;t t
369 s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
370 s,@LIBART_LIBS@,$LIBART_LIBS,;t t
371+s,@LIBART_DIR@,$LIBART_DIR,;t t
372 s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t
373 s,@GNOME_LIBS@,$GNOME_LIBS,;t t
374+s,@GNOME_DIR@,$GNOME_DIR,;t t
375 s,@GLADE_CFLAGS@,$GLADE_CFLAGS,;t t
376 s,@GLADE_LIBS@,$GLADE_LIBS,;t t
377+s,@GLADE_DIR@,$GLADE_DIR,;t t
378 s,@LIBGDA_DEPENDENCIES_CFLAGS@,$LIBGDA_DEPENDENCIES_CFLAGS,;t t
379 s,@LIBGDA_DEPENDENCIES_LIBS@,$LIBGDA_DEPENDENCIES_LIBS,;t t
380 s,@LIBGNOMEDB_DEPENDENCIES_CFLAGS@,$LIBGNOMEDB_DEPENDENCIES_CFLAGS,;t t
381 s,@LIBGNOMEDB_DEPENDENCIES_LIBS@,$LIBGNOMEDB_DEPENDENCIES_LIBS,;t t
382+s,@GNOMEDB_DIR@,$GNOMEDB_DIR,;t t
383 s,@RSVG_DEPENDENCIES_CFLAGS@,$RSVG_DEPENDENCIES_CFLAGS,;t t
384 s,@RSVG_DEPENDENCIES_LIBS@,$RSVG_DEPENDENCIES_LIBS,;t t
385+s,@RSVG_DIR@,$RSVG_DIR,;t t
386 s,@GTKHTML_DEPENDENCIES_CFLAGS@,$GTKHTML_DEPENDENCIES_CFLAGS,;t t
387 s,@GTKHTML_DEPENDENCIES_LIBS@,$GTKHTML_DEPENDENCIES_LIBS,;t t
388+s,@GTKHTML_DIR@,$GTKHTML_DIR,;t t
389 s,@GTKHTML_VERSION@,$GTKHTML_VERSION,;t t
390 s,@GTKHTML_SOVERSION@,$GTKHTML_SOVERSION,;t t
391 s,@VTE_DEPENDENCIES_CFLAGS@,$VTE_DEPENDENCIES_CFLAGS,;t t
392 s,@VTE_DEPENDENCIES_LIBS@,$VTE_DEPENDENCIES_LIBS,;t t
393+s,@VTE_DIR@,$VTE_DIR,;t t
394 s,@ENABLE_LIBART_TRUE@,$ENABLE_LIBART_TRUE,;t t
395 s,@ENABLE_LIBART_FALSE@,$ENABLE_LIBART_FALSE,;t t
396 s,@ENABLE_GNOME_TRUE@,$ENABLE_GNOME_TRUE,;t t