--- shared-mime-info-0.13.orig/Makefile.am	2004-03-04 19:29:33 +0300
+++ shared-mime-info-0.13/Makefile.am	2004-03-05 21:22:34 +0300
@@ -24,8 +24,8 @@
 
 CLEANFILES = intltool-extract intltool-merge intltool-update freedesktop.org.xml
 
-CFLAGS = @CFLAGS@ `@PKG_CONFIG@ --cflags libxml-2.0 glib-2.0`
-LDFLAGS = @LDFLAGS@ `@PKG_CONFIG@ --libs libxml-2.0 glib-2.0`
+CFLAGS = @CFLAGS@ @ALL_CFLAGS@
+LDFLAGS = @LDFLAGS@ @ALL_LIBS@
 
 @INTLTOOL_XML_RULE@
 @INTLTOOL_DESKTOP_RULE@
--- shared-mime-info-0.14/configure.in	2004-03-26 22:02:49 +0300
+++ shared-mime-info-0.14/configure.in.alt	2004-03-27 01:43:01 +0300
@@ -3,54 +3,18 @@
 AC_INIT(freedesktop.org.xml.in)
 AM_INIT_AUTOMAKE(shared-mime-info, 0.14)
 
-AC_PROG_INTLTOOL
-
 AM_CONFIG_HEADER(config.h)
 
 GETTEXT_PACKAGE=shared-mime-info
 AC_SUBST(GETTEXT_PACKAGE)
 ALL_LINGUAS="az cy fi fr hu nl nn no sv sr"
 AM_GLIB_GNU_GETTEXT
-
-dnl Check pkg-config is installed
-if test -z "$PKG_CONFIG"; then
-  PKG_CONFIG=pkg-config
-fi
-AC_SUBST(PKG_CONFIG)
-
-AC_MSG_CHECKING(that pkg-config runs)
-if "$PKG_CONFIG" --version > /dev/null 2>&1 ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([*** $PKG_CONFIG missing ***
-
-\'$PKG_CONFIG --version\' failed to run - make sure it is inside one of the
-directories in your PATH environment variable!
-
-pkg-config is available from this web page:
-
-http://www.freedesktop.org/software/pkgconfig
-])
-fi
-
-AC_DEFUN(REQUIRE, [
-AC_MSG_CHECKING(that $1 (version >= $2) is installed)
-if "$PKG_CONFIG" --atleast-version=$2 $1 ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  if "$PKG_CONFIG" --exists $1 ; then
-    AC_MSG_ERROR(Current version is only `"$PKG_CONFIG" "$1" --modversion`)
-  else
-    AC_MSG_ERROR(Package is not installed)
-  fi
-fi
-])
+AC_PROG_INTLTOOL
 
 dnl Check for libxml and glib
-REQUIRE(libxml-2.0, 2.4.0)
-REQUIRE(glib-2.0, 2.0.0)
+PKG_CHECK_MODULES(ALL, \
+    libxml-2.0 >= 2.4.0 \
+    glib-2.0 >= 2.0.0)
 
 dnl Checks for programs.
 AC_PROG_CC