--- art/art-sharp.dll.config.in.orig	Sun Nov 21 11:05:17 2004
+++ art/art-sharp.dll.config.in	Sun Nov 21 10:40:17 2004
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
+  <dllmap dll="art_lgpl" target="@LIBART_DIR@libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
 </configuration>
--- atk/atk-sharp.dll.config.in.orig	Mon Mar  7 16:37:09 2005
+++ atk/atk-sharp.dll.config.in	Mon Apr  4 14:52:38 2005
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>
--- gconf/GConf/gconf-sharp.dll.config.in.orig	Sun Nov 21 11:05:17 2004
+++ gconf/GConf/gconf-sharp.dll.config.in	Sun Nov 21 10:49:36 2004
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
+  <dllmap dll="gconf-2" target="@GNOME_DIR@libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
 </configuration>
--- gda/gda-sharp.dll.config.in.orig	Mon Mar  7 16:38:03 2005
+++ gda/gda-sharp.dll.config.in	Mon Apr  4 14:53:52 2005
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
+  <dllmap dll="gda-2" target="@GNOME_DIR@libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
 </configuration>
--- gdk/gdk-sharp.dll.config.in.orig	Sun Feb  6 08:32:24 2005
+++ gdk/gdk-sharp.dll.config.in	Sun Feb  6 08:37:29 2005
@@ -1,6 +1,7 @@
 <configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="@GNOME_DIR@libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="@GNOME_DIR@libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gdksharpglue" target="@GNOME_DIR@libgdksharpglue@LIB_SUFFIX@"/>
 </configuration>
--- glade/glade-sharp.dll.config.in.orig	Sun Feb  6 08:31:06 2005
+++ glade/glade-sharp.dll.config.in	Sun Feb  6 08:36:20 2005
@@ -1,3 +1,4 @@
 <configuration>
-  <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglade-2.0-0.dll" target="@GLADE_DIR@libglade-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gladesharpglue" target="@GLADE_DIR@libgladesharpglue@LIB_SUFFIX@"/>
 </configuration>
--- glib/glib-sharp.dll.config.in.orig	Sun Feb  6 08:30:35 2005
+++ glib/glib-sharp.dll.config.in	Sun Feb  6 08:35:32 2005
@@ -1,5 +1,6 @@
 <configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgthread-2.0-0.dll" target="@GLIB_DIR@libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="glibsharpglue" target="@GLIB_DIR@libglibsharpglue@LIB_SUFFIX@"/>
 </configuration>
--- gnome/gnome-sharp.dll.config.in.orig	Sun Feb  6 08:32:40 2005
+++ gnome/gnome-sharp.dll.config.in	Sun Feb  6 08:38:23 2005
@@ -1,11 +1,12 @@
 <configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgthread-2.0-0.dll" target="@GLIB_DIR@libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgtk-win32-2.0-0.dll" Target="@GTK_DIR@libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnome-2" target="@GNOME_DIR@libgnome-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnomecanvas-2" target="@GNOME_DIR@libgnomecanvas-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnomeprint-2-2" target="@GNOME_DIR@libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnomeprintui-2-2" target="@GNOME_DIR@libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnomeui-2" target="@GNOME_DIR@libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gnomesharpglue" target="@GNOME_DIR@libgnomesharpglue@LIB_SUFFIX@"/>
 </configuration>
--- gnomedb/gnomedb-sharp.dll.config.in.orig	Mon Mar  7 16:38:07 2005
+++ gnomedb/gnomedb-sharp.dll.config.in	Mon Apr  4 14:54:59 2005
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
+  <dllmap dll="gnomedb-2" target="@GNOMEDB_DIR@libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
 </configuration>
--- gtk/gtk-sharp.dll.config.in.orig	Sun Feb  6 08:33:00 2005
+++ gtk/gtk-sharp.dll.config.in	Sun Feb  6 08:43:57 2005
@@ -1,6 +1,7 @@
 <configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="@GLIB_DIR@libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgtk-win32-2.0-0.dll" target="@GTK_DIR@libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="gtksharpglue" target="@GTK_DIR@libgtksharpglue@LIB_SUFFIX@"/>
 </configuration>
--- pango/pango-sharp.dll.config.in.orig	Mon Mar  7 16:37:18 2005
+++ pango/pango-sharp.dll.config.in	Mon Apr  4 14:56:11 2005
@@ -1,4 +1,4 @@
 <configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libglib-2.0-0.dll" target="@GLIB_DIR@libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libpango-1.0-0.dll" target="@PANGO_DIR@libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 </configuration>
--- rsvg/rsvg-sharp.dll.config.in.orig	Sun Nov 21 11:05:17 2004
+++ rsvg/rsvg-sharp.dll.config.in	Sun Nov 21 10:59:56 2004
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
+  <dllmap dll="rsvg-2" target="@RSVG_DIR@librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
 </configuration>
--- vte/vte-sharp.dll.config.in.orig	Mon Mar  7 16:37:17 2005
+++ vte/vte-sharp.dll.config.in	Mon Apr  4 14:57:20 2005
@@ -1,4 +1,4 @@
 <configuration>
-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
+  <dllmap dll="libatk-1.0-0.dll" target="@GNOME_DIR@libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="vte" target="@VTE_DIR@libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
 </configuration>
--- gtkhtml/gtkhtml-sharp.dll.config.in.orig	Mon Mar  7 16:38:00 2005
+++ gtkhtml/gtkhtml-sharp.dll.config.in	Mon Apr  4 14:58:18 2005
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
+  <dllmap dll="gtkhtml-3.0" target="@GTKHTML_DIR@libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
 </configuration>
--- configure.in.orig	Mon Mar 14 22:30:14 2005
+++ configure.in	Mon Apr  4 13:46:54 2005
@@ -108,16 +108,22 @@
 AC_SUBST(GENERATED_SOURCES)
 
 PKG_CHECK_MODULES(GLIB, gobject-2.0)
+GLIB_DIR="`$PKG_CONFIG --variable=libdir gobject-2.0`/"
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_DIR)
 
 PKG_CHECK_MODULES(PANGO, pango)
+PANGO_DIR="`$PKG_CONFIG --variable=libdir pango`/"
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
+AC_SUBST(PANGO_DIR)
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
+GTK_DIR="`$PKG_CONFIG --variable=libdir gtk+-2.0`/"
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_DIR)
 
 PKG_CHECK_MODULES(XML, libxml-2.0)
 AC_SUBST(XML_CFLAGS)
@@ -128,46 +134,60 @@
 GTK_REQUIRED_VERSION=2.2.0
 
 PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
+LIBART_DIR="`$PKG_CONFIG --variable=libdir libart-2.0`/"
 AC_SUBST(LIBART_CFLAGS)
 AC_SUBST(LIBART_LIBS)
+AC_SUBST(LIBART_DIR)
 
 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)
+GNOME_DIR="`$PKG_CONFIG --variable=libdir libgnomecanvas-2.0`/"
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
+AC_SUBST(GNOME_DIR)
 
 GLADE_REQUIRED_VERSION=2.0.0
 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
+GLADE_DIR="`$PKG_CONFIG --variable=libdir libglade-2.0`/"
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
+AC_SUBST(GLADE_DIR)
 
 LIBGDA_REQUIRED_VERSION=1.0.0
 PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no)
 
 enable_gnomedb=no
+GNOMEDB_DIR=
 if test "x$enable_gnome" = "xyes"; then
 if test "x$enable_gda" = "xyes"; then
 	PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no)
+	GNOMEDB_DIR="`$PKG_CONFIG --variable=libdir libgnomedb`/"
 fi
 fi
+AC_SUBST(GNOMEDB_DIR)
 
 RSVG_REQUIRED_VERSION=2.0.1
 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
+RSVG_DIR="`$PKG_CONFIG --variable=libdir librsvg-2.0`/"
+AC_SUBST(RSVG_DIR)
 
 GTKHTML_REQUIRED_VERSION=3.6.0
 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.6`/"
 GTKHTML_VERSION=3.6
 GTKHTML_SOVERSION=18
 else
 GTKHTML_REQUIRED_VERSION=3.2.0
 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.1`/"
 GTKHTML_VERSION=3.1
 GTKHTML_SOVERSION=11
 else
 GTKHTML_REQUIRED_VERSION=3.0.10
 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.0`/"
 GTKHTML_VERSION=3.0
 GTKHTML_SOVERSION=4
 else
@@ -176,12 +196,15 @@
 fi
 fi
 fi
+AC_SUBST(GTKHTML_DIR)
 AC_SUBST(GTKHTML_VERSION)
 AC_SUBST(GTKHTML_SOVERSION)
 
 if test "x$enable_gnome" = "xyes"; then
 VTE_REQUIRED_VERSION=0.11.10
 PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no)
+VTE_DIR="`$PKG_CONFIG --variable=libdir vte`/"
+AC_SUBST(VTE_DIR)
 else
 enable_vte=no
 fi
--- aclocal.m4.orig     Mon Mar 14 22:30:26 2005
+++ aclocal.m4  Mon Apr  4 13:52:59 2005
@@ -1270,7 +1270,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds=".dylib"
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--- configure.orig	Mon Apr  4 14:50:42 2005
+++ configure	Mon Apr  4 15:00:29 2005
@@ -463,7 +463,7 @@
 # include <unistd.h>
 #endif"
 
-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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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'
+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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -9046,7 +9046,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds=".dylib"
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -12754,7 +12754,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds=".dylib"
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -15914,7 +15914,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds=".dylib"
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -18272,7 +18272,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds=".dylib"
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -21305,6 +21305,8 @@
    { (exit 1); exit 1; }; }
   fi
 
+GLIB_DIR="`$PKG_CONFIG --variable=libdir gobject-2.0`/"
+
 
 
 
@@ -21406,6 +21408,8 @@
    { (exit 1); exit 1; }; }
   fi
 
+PANGO_DIR="`$PKG_CONFIG --variable=libdir pango`/"
+
 
 
 
@@ -21507,6 +21511,8 @@
    { (exit 1); exit 1; }; }
   fi
 
+GTK_DIR="`$PKG_CONFIG --variable=libdir gtk+-2.0`/"
+
 
 
 
@@ -21711,6 +21717,8 @@
      enable_libart=no
   fi
 
+LIBART_DIR="`$PKG_CONFIG --variable=libdir libart-2.0`/"
+
 
 
 
@@ -21810,6 +21818,8 @@
      enable_gnome=no
   fi
 
+GNOME_DIR="`$PKG_CONFIG --variable=libdir libgnomecanvas-2.0`/"
+
 
 
 
@@ -21910,6 +21920,8 @@
      enable_glade=no
   fi
 
+GLADE_DIR="`$PKG_CONFIG --variable=libdir libglade-2.0`/"
+
 
 
 
@@ -22012,6 +22024,7 @@
 
 
 enable_gnomedb=no
+GNOMEDB_DIR=
 if test "x$enable_gnome" = "xyes"; then
 if test "x$enable_gda" = "xyes"; then
 
@@ -22110,9 +22123,11 @@
      enable_gnomedb=no
   fi
 
+	GNOMEDB_DIR="`$PKG_CONFIG --variable=libdir libgnomedb`/"
 fi
 fi
 
+
 RSVG_REQUIRED_VERSION=2.0.1
 
   succeeded=no
@@ -22210,6 +22225,8 @@
      enable_rsvg=no
   fi
 
+RSVG_DIR="`$PKG_CONFIG --variable=libdir librsvg-2.0`/"
+
 
 GTKHTML_REQUIRED_VERSION=3.6.0
 
@@ -22309,6 +22326,7 @@
   fi
 
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.6`/"
 GTKHTML_VERSION=3.6
 GTKHTML_SOVERSION=18
 else
@@ -22410,6 +22428,7 @@
   fi
 
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.1`/"
 GTKHTML_VERSION=3.1
 GTKHTML_SOVERSION=11
 else
@@ -22511,6 +22530,7 @@
   fi
 
 if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_DIR="`$PKG_CONFIG --variable=libdir libgtkhtml-3.0`/"
 GTKHTML_VERSION=3.0
 GTKHTML_SOVERSION=4
 else
@@ -22522,6 +22542,7 @@
 
 
 
+
 if test "x$enable_gnome" = "xyes"; then
 VTE_REQUIRED_VERSION=0.11.10
 
@@ -22620,6 +22641,8 @@
      enable_vte=no
   fi
 
+VTE_DIR="`$PKG_CONFIG --variable=libdir vte`/"
+
 else
 enable_vte=no
 fi
@@ -23599,30 +23622,40 @@
 s,@GENERATED_SOURCES@,$GENERATED_SOURCES,;t t
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
+s,@GLIB_DIR@,$GLIB_DIR,;t t
 s,@PANGO_CFLAGS@,$PANGO_CFLAGS,;t t
 s,@PANGO_LIBS@,$PANGO_LIBS,;t t
+s,@PANGO_DIR@,$PANGO_DIR,;t t
 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
 s,@GTK_LIBS@,$GTK_LIBS,;t t
+s,@GTK_DIR@,$GTK_DIR,;t t
 s,@XML_CFLAGS@,$XML_CFLAGS,;t t
 s,@XML_LIBS@,$XML_LIBS,;t t
 s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
 s,@LIBART_LIBS@,$LIBART_LIBS,;t t
+s,@LIBART_DIR@,$LIBART_DIR,;t t
 s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t
 s,@GNOME_LIBS@,$GNOME_LIBS,;t t
+s,@GNOME_DIR@,$GNOME_DIR,;t t
 s,@GLADE_CFLAGS@,$GLADE_CFLAGS,;t t
 s,@GLADE_LIBS@,$GLADE_LIBS,;t t
+s,@GLADE_DIR@,$GLADE_DIR,;t t
 s,@LIBGDA_DEPENDENCIES_CFLAGS@,$LIBGDA_DEPENDENCIES_CFLAGS,;t t
 s,@LIBGDA_DEPENDENCIES_LIBS@,$LIBGDA_DEPENDENCIES_LIBS,;t t
 s,@LIBGNOMEDB_DEPENDENCIES_CFLAGS@,$LIBGNOMEDB_DEPENDENCIES_CFLAGS,;t t
 s,@LIBGNOMEDB_DEPENDENCIES_LIBS@,$LIBGNOMEDB_DEPENDENCIES_LIBS,;t t
+s,@GNOMEDB_DIR@,$GNOMEDB_DIR,;t t
 s,@RSVG_DEPENDENCIES_CFLAGS@,$RSVG_DEPENDENCIES_CFLAGS,;t t
 s,@RSVG_DEPENDENCIES_LIBS@,$RSVG_DEPENDENCIES_LIBS,;t t
+s,@RSVG_DIR@,$RSVG_DIR,;t t
 s,@GTKHTML_DEPENDENCIES_CFLAGS@,$GTKHTML_DEPENDENCIES_CFLAGS,;t t
 s,@GTKHTML_DEPENDENCIES_LIBS@,$GTKHTML_DEPENDENCIES_LIBS,;t t
+s,@GTKHTML_DIR@,$GTKHTML_DIR,;t t
 s,@GTKHTML_VERSION@,$GTKHTML_VERSION,;t t
 s,@GTKHTML_SOVERSION@,$GTKHTML_SOVERSION,;t t
 s,@VTE_DEPENDENCIES_CFLAGS@,$VTE_DEPENDENCIES_CFLAGS,;t t
 s,@VTE_DEPENDENCIES_LIBS@,$VTE_DEPENDENCIES_LIBS,;t t
+s,@VTE_DIR@,$VTE_DIR,;t t
 s,@ENABLE_LIBART_TRUE@,$ENABLE_LIBART_TRUE,;t t
 s,@ENABLE_LIBART_FALSE@,$ENABLE_LIBART_FALSE,;t t
 s,@ENABLE_GNOME_TRUE@,$ENABLE_GNOME_TRUE,;t t
