diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2007-02-25 11:05:01 +0100 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2007-02-25 11:05:01 +0100 |
| commit | 3977a8299d06a7ee2c58415ceba9f7a1b30fdd2f (patch) | |
| tree | fd026d051a4ed81e87de80e29e18e47e0094cd2c /Makefile.am | |
| parent | b81987653f180c152d6a8daa83499e3f156d3511 (diff) | |
| download | pkg-config-3977a8299d06a7ee2c58415ceba9f7a1b30fdd2f.tar.gz | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
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 |