diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-29 16:51:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-29 16:51:37 +0000 |
| commit | 1493f6f7d4f4b49cc95fc1693cbee19fd3573503 (patch) | |
| tree | e27a3be3b12ef5f5a7f46580cc1bc2ab4271a378 /m4macros | |
| parent | 62adef452ef810079f05a6bf3076f7eb5d40c493 (diff) | |
| download | gtk+-1493f6f7d4f4b49cc95fc1693cbee19fd3573503.tar.gz | |
Don't try to use pkg-config when we didn't find it. (#62944, Eric Lemings)
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gtk-2.0.m4 | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 index 8358f5e2ed..a4c326b6e0 100644 --- a/m4macros/gtk-2.0.m4 +++ b/m4macros/gtk-2.0.m4 @@ -34,22 +34,25 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run no_gtk=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 GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no + else + no_gtk=yes fi min_gtk_version=ifelse([$1], ,1.3.3,$1) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) + 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 GTK+ found in PKG_CONFIG_PATH" + enable_gtktest=no + fi - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk = yes + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then + : + else + no_gtk=yes + fi fi if test x"$no_gtk" = x ; then |