diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-07 16:39:54 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-07 16:39:54 +0000 |
| commit | fab889b14d4c71cc3d45aee2f610fdad0aa16ab1 (patch) | |
| tree | e97e3c308ab5b44c92e753f5a83e2785545a0862 /m4macros | |
| parent | 632943f359274cef42a6a77d4fa43caeedef7d87 (diff) | |
subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables
2001-06-07 Havoc Pennington <hp@redhat.com>
* m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
GLIB_MKENUMS variables
* gmodule-2.0.pc.in: add gmodule_supported variable
* glib-2.0.pc.in: add glib_genmarshal, gobject_query,
glib_mkenums variables
* configure.in: put G_MODULE_SUPPORTED value into
.pc files
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
2001-06-07 Havoc Pennington <hp@redhat.com>
* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
other libs
* configure.in: use AM_PATH_GLIB_2_0
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: dist the .pc.in files
2001-06-07 Havoc Pennington <hp@redhat.com>
* atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
glib-genmarshal
* configure.in: rearrange the library checks to support
uninstalled linking
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* atk-uninstalled.pc.in: new file, allows linking to uninstalled
ATK in giant GTK tarball
2001-06-07 Havoc Pennington <hp@redhat.com>
* tests/Makefile.am: add missing -I flag
* gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc.
* configure.in: use pkg-config to see if GModule is
supported; fix to properly turn on included loaders
when GModule isn't supported; don't use AC_CHECK_LIB
when libs are not installed yet
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* Makefile.am (SUBDIRS): add m4macros subdir
* gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in
dependencies also.
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/glib-2.0.m4 | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index 646c7950c..a69cd9c71 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -30,22 +30,38 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - min_glib_version=ifelse([$1], ,1.3.3,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.5 ; then + if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then : else - echo *** pkg-config too old; version 0.5 or better required. + echo *** pkg-config too old; version 0.7 or better required. no_glib=yes PKG_CONFIG=no fi fi + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + min_glib_version=ifelse([$1], ,1.3.3,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib = yes + fi + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -178,9 +194,15 @@ main () fi GLIB_CFLAGS="" GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" ifelse([$3], , :, [$3]) fi AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) rm -f conf.glibtest ]) |