diff --git a/m4/moo-gtk.m4 b/m4/moo-gtk.m4 index d75cbbc6..de29e7b8 100644 --- a/m4/moo-gtk.m4 +++ b/m4/moo-gtk.m4 @@ -20,17 +20,16 @@ AC_MSG_RESULT($[]$1[]_MAJOR_VERSION.$[]$1[]_MINOR_VERSION.$[]$1[]_MICRO_VERSION) ############################################################################## -# MOO_CHECK_VERSION(PKG_NAME,pkg-name) +# MOO_CHECK_MINOR_VERSION(PKG_NAME,pkg-name,versions) # -AC_DEFUN([MOO_CHECK_VERSION],[ -PKG_CHECK_MODULES($1,$2) -# _MOO_SPLIT_VERSION_PKG($1,$2) -# m4_foreach([num],[2,4,6,8,10,12,14], -# [AM_CONDITIONAL($1[]_2_[]num, test $[]$1[]_MINOR_VERSION -ge num) -# if test $[]$1[]_MINOR_VERSION -ge num; then -# $1[]_2_[]num=yes -# fi -# ]) +AC_DEFUN([MOO_CHECK_MINOR_VERSION],[ + _MOO_SPLIT_VERSION_PKG($1,$2) + m4_foreach([num],[$3], + [AM_CONDITIONAL($1[]_2_[]num, test $[]$1[]_MINOR_VERSION -ge num) + if test $[]$1[]_MINOR_VERSION -ge num; then + $1[]_2_[]num=yes + fi + ]) ]) @@ -56,13 +55,14 @@ fi # AC_DEFUN_ONCE([MOO_PKG_CHECK_GTK_VERSIONS],[ AC_REQUIRE([MOO_AC_CHECK_OS]) -MOO_CHECK_VERSION(GTK, gtk+-2.0) -MOO_CHECK_VERSION(GLIB, glib-2.0) -MOO_CHECK_VERSION(GTHREAD, gthread-2.0) -MOO_CHECK_VERSION(GMODULE, gmodule-2.0) -# MOO_CHECK_VERSION(GDK, gdk-2.0) +PKG_CHECK_MODULES(GTK, gtk+-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0) +PKG_CHECK_MODULES(GTHREAD, gthread-2.0) +PKG_CHECK_MODULES(GMODULE, gmodule-2.0) +# PKG_CHECK_MODULES(GDK, gdk-2.0) +MOO_CHECK_MINOR_VERSION(GLIB, glib-2.0, [32]) -MOO_CHECK_VERSION(XML, libxml-2.0) +PKG_CHECK_MODULES(XML, libxml-2.0) _MOO_CHECK_BROKEN_GTK_THEME