2007-02-25 Tollef Fog Heen <tfheen@err.no>

	* Makefile.am: Add support for using the system glib.  Thanks to
	Peter Breitenlohner for the bug and the patch.  Freedesktop #9708

	* configure.in: Add support for using the system glib.

	* glib-patches/no-dist-distclean-files.diff,
	glib-patches/automake-warning.diff,
	glib-patches/autoconf-warning.diff:  Get rid of some warnings when
	configuring glib.

3 files changed, 81 insertions, 0 deletions

diff --git a/glib-patches/autoconf-warning.diff b/glib-patches/autoconf-warning.diff
new file mode 100644
index 0000000..3965631
--- /dev/null
+++ b/glib-patches/autoconf-warning.diff
@@ -0,0 +1,24 @@
+	This is file patch-06-autoconf-warning for pkg-config-0.21
+
+	Fix autoconf (2.61a) warning
+		AC_CACHE_VAL(glib_cv_sane_realloc, ...): suspicious presence of
+		an AC_DEFINE in the second argument, where no actions should be taken
+
+diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/configure.in pkg-config-0.21/glib-1.2.8/configure.in
+--- pkg-config-0.21.orig/glib-1.2.8/configure.in	2006-08-16 20:24:29.000000000 +0200
++++ pkg-config-0.21/glib-1.2.8/configure.in	2007-01-19 15:05:37.000000000 +0100
+@@ -384,11 +384,13 @@
+ 	  return realloc (0, sizeof (int)) == 0;
+ 	}],
+ 	glib_cv_sane_realloc=yes
+-	AC_DEFINE(REALLOC_0_WORKS)
+ 	,
+ 	glib_cv_sane_realloc=no
+ 	,)
+ ])
++if test x$glib_cv_sane_realloc = xyes; then
++	AC_DEFINE(REALLOC_0_WORKS)
++fi
+ AC_MSG_RESULT($glib_cv_sane_realloc)
+ 
+ 
diff --git a/glib-patches/automake-warning.diff b/glib-patches/automake-warning.diff
new file mode 100644
index 0000000..0608cc1
--- /dev/null
+++ b/glib-patches/automake-warning.diff
@@ -0,0 +1,39 @@
+	This is file patch-05-automake-warning for pkg-config-0.21
+
+	Fix automake (1.10) warnings
+		BUILT_SOURCES multiply defined in condition TRUE ...
+		noinst_DATA multiply defined in condition TRUE ...
+		whitespace following trailing backslash
+
+diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/Makefile.am pkg-config-0.21/glib-1.2.8/Makefile.am
+--- pkg-config-0.21.orig/glib-1.2.8/Makefile.am	2006-08-16 20:24:29.000000000 +0200
++++ pkg-config-0.21/glib-1.2.8/Makefile.am	2007-01-19 15:03:19.000000000 +0100
+@@ -8,7 +8,7 @@
+ configincludedir = $(pkglibdir)/include
+ 
+ noinst_SCRIPTS=glib-config
+-BUILT_SOURCES=glib-config
++#BUILT_SOURCES=glib-config
+ glib-config: glib-config.in
+ 
+ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+@@ -60,8 +60,8 @@
+ noinst_HEADERS = \
+ 	glib.h
+ 
+-noinst_DATA = \
+-	glibconfig.h
++#noinst_DATA = \
++#	glibconfig.h
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4		
+ 
+@@ -121,7 +121,7 @@
+ 	fi \
+ 	&& cp glib.spec $(distdir)
+ 
+-DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \ 
++DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \
+                config.h.win32
+ 
+ CLEANFILES = stamp-gc-h  makefile.msc
diff --git a/glib-patches/no-dist-distclean-files.diff b/glib-patches/no-dist-distclean-files.diff
new file mode 100644
index 0000000..67173dc
--- /dev/null
+++ b/glib-patches/no-dist-distclean-files.diff
@@ -0,0 +1,18 @@
+	This is file patch-07-dist for pkg-config-0.21
+		to be applied on top of patch-05-automake-warning
+
+	Don't distribute DISTCLEAN files
+
+diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/Makefile.am pkg-config-0.21/glib-1.2.8/Makefile.am
+--- pkg-config-0.21.orig/glib-1.2.8/Makefile.am	2007-01-19 15:03:19.000000000 +0100
++++ pkg-config-0.21/glib-1.2.8/Makefile.am	2007-01-19 15:07:29.000000000 +0100
+@@ -23,9 +23,7 @@
+ 	makefile.msc.in		\
+ 	makefile.msc		\
+ 	giowin32.c		\
+-	glibconfig.h.win32	\
+ 	glibconfig.h.win32.in	\
+-	config.h.win32		\
+ 	config.h.win32.in
+ 
+ noinst_LTLIBRARIES = libglib.la