From 3977a8299d06a7ee2c58415ceba9f7a1b30fdd2f Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 25 Feb 2007 11:05:01 +0100 Subject: 2007-02-25 Tollef Fog Heen * 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. --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 4fcde30..bb7db28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,10 +2,11 @@ if USE_INSTALLED_GLIB included_glib_includes = @GLIB_CFLAGS@ pkg_config_LDADD=@GLIB_LIBS@ else -SUBDIRS = glib-1.2.8 check +GLIB_SUBDIR = glib-1.2.8 included_glib_includes = -I./glib-1.2.8 pkg_config_LDADD=glib-1.2.8/libglib.la endif +SUBDIRS = $(GLIB_SUBDIR) check m4dir = $(datadir)/aclocal m4_DATA = pkg.m4 -- cgit v1.2.1