summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2007-06-17 21:44:42 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2007-06-17 21:44:42 +0000
commit22fec48feeba32af14e154effe618f43f079b69a (patch)
treeab9e7c4cbe92867f64550da7a3f4aedb7403b8e9
parent40bcac38c149f7c5f9f024cfcb1276f5da0df499 (diff)
downloadirssi-22fec48feeba32af14e154effe618f43f079b69a.zip
Update to latest revision.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4564 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--glib-2.0.m4_13
1 files changed, 3 insertions, 10 deletions
diff --git a/glib-2.0.m4_ b/glib-2.0.m4_
index d6413ff7..2a5afd0c 100644
--- a/glib-2.0.m4_
+++ b/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)