diff options
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/gtk-3.0.m4 | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/m4macros/gtk-3.0.m4 b/m4macros/gtk-3.0.m4 index 642468782f..799c7be6e6 100644 --- a/m4macros/gtk-3.0.m4 +++ b/m4macros/gtk-3.0.m4 @@ -25,23 +25,15 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run no_gtk="" - AC_PATH_TOOL([PKG_CONFIG], [pkg-config], [no]) + PKG_PROG_PKG_CONFIG([0.16]) - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else + if test -z "$PKG_CONFIG"; then no_gtk=yes fi AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - if test x$PKG_CONFIG != xno ; then + if test -n "$PKG_CONFIG"; 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" @@ -152,7 +144,7 @@ main () ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then + if test -z "$PKG_CONFIG"; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://pkgconfig.sourceforge.net" else @@ -201,7 +193,8 @@ AC_DEFUN([GTK_CHECK_BACKEND], min_gtk_version=ifelse([$2],,3.0.0,$2) pkg_config_args="$pkg_config_args >= $min_gtk_version" - AC_PATH_TOOL([PKG_CONFIG], [pkg-config], [AC_MSG_ERROR([No pkg-config found])]) + PKG_PROG_PKG_CONFIG([0.16]) + AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])]) if $PKG_CONFIG $pkg_config_args ; then target_found=yes |