--- ./pkg.h	Fri Sep  6 16:00:08 2002
+++ ../pkgconfig-0.15.0/./pkg.h	Fri Jun  6 21:14:42 2003
@@ -84,6 +84,7 @@
 char *   package_get_I_cflags     (Package    *pkg);
 char *   packages_get_I_cflags    (GSList     *pkgs);
 char *   package_get_other_cflags (Package    *pkg);
+char *   packages_get_other_cflags (GSList    *pkgs);
 char *   packages_get_all_cflags  (GSList     *pkgs);
 char *   package_get_var          (Package    *pkg,
                                    const char *var);
--- ./Makefile.in	Thu Jan 16 16:09:56 2003
+++ ../pkgconfig-0.15.0/./Makefile.in	Fri Jun  6 23:33:27 2003
@@ -76,8 +76,8 @@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 VERSION = @VERSION@
-@USE_INSTALLED_GLIB_TRUE@included_glib_includes = @USE_INSTALLED_GLIB_TRUE@@GLIB_CFLAGS@
-@USE_INSTALLED_GLIB_FALSE@included_glib_includes = @USE_INSTALLED_GLIB_FALSE@-I./glib-1.2.8
+@USE_INSTALLED_GLIB_TRUE@pkg_config_CFLAGS = @USE_INSTALLED_GLIB_TRUE@@GLIB_CFLAGS@
+@USE_INSTALLED_GLIB_FALSE@pkg_config_CFLAGS = @USE_INSTALLED_GLIB_FALSE@-I./glib-1.2.8
 @USE_INSTALLED_GLIB_TRUE@pkg_config_LDADD = @USE_INSTALLED_GLIB_TRUE@@GLIB_LIBS@
 @USE_INSTALLED_GLIB_FALSE@pkg_config_LDADD = @USE_INSTALLED_GLIB_FALSE@glib-1.2.8/libglib.la
 @USE_INSTALLED_GLIB_FALSE@SUBDIRS = @USE_INSTALLED_GLIB_FALSE@glib-1.2.8
@@ -90,7 +90,7 @@
 
 bin_PROGRAMS = pkg-config
 
-INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes)
+INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" $(pkg_config_CFLAGS)
 
 pkg_config_SOURCES = \
 	pkg.h \
--- ./ltmain.sh	Thu Jan 16 16:09:16 2003
+++ ../pkgconfig-0.15.0/./ltmain.sh	Fri Jun  6 16:00:45 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./configure	Thu Jan 16 16:09:17 2003
+++ ../pkgconfig-0.15.0/./configure	Fri Jun  6 23:31:24 2003
@@ -5514,6 +5514,7 @@
 case "$host" in
   *-*-mingw*)
     native_win32=yes
+    use_installed_glib=yes
     cat >> confdefs.h <<\EOF
 #define USE_INSTALLED_GLIB 1
 EOF
@@ -5520,14 +5521,22 @@
 
   ;;
   *)
+    use_installed_glib=no
     native_win32=no
   ;;
 esac
 echo "$ac_t""$native_win32" 1>&6
 
+if test x${FORCE_INSTALLED_GLIB+set} = xset; then
+    use_installed_glib=yes
+    cat >> confdefs.h <<\EOF
+#define USE_INSTALLED_GLIB 1
+EOF
+    echo "Forcing use of installed glib... " 1>&6
+fi
 
 
-if test x$native_win32 = xyes; then
+if test x$use_installed_glib = xyes; then
   USE_INSTALLED_GLIB_TRUE=
   USE_INSTALLED_GLIB_FALSE='#'
 else
@@ -5568,6 +5577,23 @@
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
+elif test $use_installed_glib = yes; then
+  GLIB_CFLAGS="`glib-config --cflags`"
+  GLIB_LIBS="`glib-config --libs`"
+
+  ac_aux_dir=
+for ac_dir in . $srcdir/.; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+
 else
   subdirs="glib-1.2.8"
 
@@ -6322,7 +6348,7 @@
     esac
   done
 
-  for ac_config_dir in glib-1.2.8; do
+  for ac_config_dir in $subdirs dummy; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.