summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-01-08 04:42:31 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-08 04:42:31 +0000
commit8a688f12f05a0a5e70570a6af6efdc24f52cb53f (patch)
tree231b4efd739b681cd4e1a03c601d9ec1a776b611 /m4macros
parentbb551b0cd94fa246e0e40e7f3939d0255c212337 (diff)
downloadglib-8a688f12f05a0a5e70570a6af6efdc24f52cb53f.tar.gz
Use PKG_PROG_PKG_CONFIG. (#392636, Yevgen Muntyan)
2007-01-07 Matthias Clasen <mclasen@redhat.com> * m4macros/glib-2.0.m4: Use PKG_PROG_PKG_CONFIG. (#392636, Yevgen Muntyan) svn path=/trunk/; revision=5225
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/glib-2.0.m413
1 files changed, 3 insertions, 10 deletions
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4
index d6413ff76..2a5afd0c0 100644
--- a/m4macros/glib-2.0.m4
+++ b/m4macros/glib-2.0.m4
@@ -31,20 +31,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
esac
done
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ PKG_PROG_PKG_CONFIG([0.7])
no_glib=""
- 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_glib=yes
- PKG_CONFIG=no
- fi
- else
+ if test "x$PKG_CONFIG" = x ; then
no_glib=yes
+ PKG_CONFIG=no
fi
min_glib_version=ifelse([$1], ,2.0.0,$1)