From 75755ba614e2b7f014fe33c619867b58a9c55598 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon, 9 Apr 2012 20:04:58 -0700
Subject: glib: Avoid pkg-config usage in bundled library

The whole exercise of carrying an internal copy of glib to avoid the
circular dependency is moot if it's still using pkg-config.
---
 glib-patches/no-pkg-config.patch | 51 ++++++++++++++++++++++++++++++++++++++++
 glib-patches/patchlist           |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 glib-patches/no-pkg-config.patch

(limited to 'glib-patches')

diff --git a/glib-patches/no-pkg-config.patch b/glib-patches/no-pkg-config.patch
new file mode 100644
index 0000000..4ca2bb3
--- /dev/null
+++ b/glib-patches/no-pkg-config.patch
@@ -0,0 +1,51 @@
+diff --git a/glib/configure.ac b/glib/configure.ac
+index 41780cd..4cfd8fa 100644
+--- a/glib/configure.ac
++++ b/glib/configure.ac
+@@ -277,8 +277,6 @@ AC_PROG_INSTALL
+ 
+ AC_SYS_LARGEFILE
+ 
+-PKG_PROG_PKG_CONFIG(0.16)
+-
+ if test "x$enable_debug" = "xyes"; then
+   if test x$cflags_set != xset ; then
+       case " $CFLAGS " in
+@@ -437,23 +435,6 @@ AC_MSG_RESULT($enable_iconv_cache)
+ 
+ 
+ dnl
+-dnl zlib support
+-dnl
+-PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
+-if test "x$found_zlib" = "xno" ; then
+-  AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
+-  if test "x$found_zlib" = "xno" ; then
+-    AC_MSG_ERROR([*** Working zlib library and headers not found ***])
+-  fi
+-  ZLIB_LIBS='-lz'
+-  AC_SUBST(ZLIB_LIBS)
+-fi
+-
+-PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
+-AC_SUBST(LIBFFI_CFLAGS)
+-AC_SUBST(LIBFFI_LIBS)
+-
+-dnl
+ dnl gettext support
+ dnl
+ 
+@@ -3312,12 +3293,7 @@ AC_CHECK_ALIGNOF([unsigned long])
+ # Check for libdbus1 - Optional - is only used in the GDBus test cases
+ #
+ # 1.2.14 required for dbus_message_set_serial
+-PKG_CHECK_MODULES(DBUS1,
+-                  dbus-1 >= 1.2.14,
+-                  [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
+-                  have_dbus1=no)
+-AC_SUBST(DBUS1_CFLAGS)
+-AC_SUBST(DBUS1_LIBS)
++have_dbus1=no
+ AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+ 
+ dnl
diff --git a/glib-patches/patchlist b/glib-patches/patchlist
index 7998f21..636863e 100644
--- a/glib-patches/patchlist
+++ b/glib-patches/patchlist
@@ -2,3 +2,4 @@ glib-only.patch
 no-installed-files.patch
 foreign-automake.patch
 no-gregex.patch
+no-pkg-config.patch
-- 
cgit v1.2.3