diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-29 16:48:40 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-29 16:48:40 +0000 |
| commit | 227ae2a96c37d37912a63d1432e008e3ac1734ef (patch) | |
| tree | e6fdb6f3b91e9970285ec6783ee9fb00f23b4f9c /m4macros/glib-2.0.m4 | |
| parent | 404bb824c9514a3963c99116e2013240be31eef0 (diff) | |
| download | glib-227ae2a96c37d37912a63d1432e008e3ac1734ef.tar.gz | |
Don't try to use PKG_CONFIG when we didn't find it. (#62944, Eric Lemings)
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Diffstat (limited to 'm4macros/glib-2.0.m4')
| -rw-r--r-- | m4macros/glib-2.0.m4 | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index b5dba4fcf..9945ce3e6 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -40,21 +40,25 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru 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 + else + no_glib=yes 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 + if test x$PKG_CONFIG != xno ; then + ## 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 + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi fi if test x"$no_glib" = x ; then |