From 99964eddb5935173fcedfc793e762d7dc7d01bba Mon Sep 17 00:00:00 2001
From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 19 Aug 2010 18:54:12 +0200
Subject: Stop shipping an embedded glib

Drop the embedded glib, the associated patches and adjust build
scripts appropriately.
---
 Makefile.am | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index a7d9fc6..5fde154 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,4 @@
-if USE_INSTALLED_GLIB
-included_glib_includes = @GLIB_CFLAGS@
 pkg_config_LDADD=@GLIB_LIBS@
-else
-GLIB_SUBDIR = glib-1.2.10
-included_glib_includes = -I$(top_srcdir)/glib-1.2.10 -I$(top_builddir)/glib-1.2.10
-pkg_config_LDADD=glib-1.2.10/libglib.la
-endif
 
 if USE_INSTALLED_POPT
 pkg_config_LDADD += $(POPT_LIBS)
@@ -28,7 +21,7 @@ EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
 bin_PROGRAMS = pkg-config
 AM_CFLAGS=@WARN_CFLAGS@
 
-INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes) \
+INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" @GLIB_CFLAGS@ \
 	$(popt_includes)
 
 pkg_config_SOURCES= \
-- 
cgit v1.2.1