diff options
author | Martin Baulig <martin@home-of-linux.org> | 2000-11-26 15:01:12 +0000 |
---|---|---|
committer | Martin Baulig <martin@src.gnome.org> | 2000-11-26 15:01:12 +0000 |
commit | cc1c5fc96cb06dc73f5df61cc200302260e2f7d3 (patch) | |
tree | 02ebde59a796466eaabc29cda416c1d973a426d8 /macros2/gnome-x-checks.m4 | |
parent | f98e0213661af27afccdcef5c2f76a8cbfe99a61 (diff) | |
download | shared-mime-info-cc1c5fc96cb06dc73f5df61cc200302260e2f7d3.tar.gz |
Use GNOME_PKGCONFIG_CHECK_MODULES.
2000-11-26 Martin Baulig <martin@home-of-linux.org>
* gnome-x-checks.m4 (GNOME2_X_CHECKS): Use
GNOME_PKGCONFIG_CHECK_MODULES.
* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Don't
AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]).
(GNOME_CHECK_PKGCONFIG): Check for pkg-config >= 0.4.1.
svn path=/trunk/; revision=1473
Diffstat (limited to 'macros2/gnome-x-checks.m4')
-rw-r--r-- | macros2/gnome-x-checks.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macros2/gnome-x-checks.m4 b/macros2/gnome-x-checks.m4 index b5338eba..7081644e 100644 --- a/macros2/gnome-x-checks.m4 +++ b/macros2/gnome-x-checks.m4 @@ -2,7 +2,7 @@ dnl GNOME_X_CHECKS dnl dnl Basic X11 related checks for X11. At the end, the following will be dnl defined/changed: -dnl GTK_{CFLAGS,LIBS} From AM_PATH_GTK +dnl GTK_{CFLAGS,LIBS} From GTK+ dnl CPPFLAGS Will include $X_CFLAGS dnl GNOME_HAVE_SM `true' or `false' depending on whether session dnl management is available. It is available if @@ -15,7 +15,9 @@ dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} dnl AC_DEFUN([GNOME2_X_CHECKS], [ - PKG_CHECK_MODULES(GTK, gtk+-2.0:1.3.1) + AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) + + GNOME_PKGCONFIG_CHECK_MODULES(GTK, gtk+-2.0:1.3.1) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) |