diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-11-06 12:27:32 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-11-06 12:28:53 +0000 |
| commit | 5d5356b0b80a6a579fea0b5f72b5b3a050efbdaf (patch) | |
| tree | e204ef49f15aacb30d1657a5c0861e42aea8d277 | |
| parent | 1eb9190ad966ec2cc5528f623647941b588536bd (diff) | |
configure: we still require Gtk+ >= 2.14.0 when compiling against 2.0
The check for the minor version was dropped in one of the previous
commits.
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c057cd713..396b427c9 100644 --- a/configure.ac +++ b/configure.ac @@ -206,18 +206,24 @@ AC_SUBST(GSTPB_PREFIX) dnl GTK is optional and used in examples HAVE_GTK=NO +GTK2_REQ=2.14.0 +GTK3_REQ=2.91.3 if test "x$BUILD_EXAMPLES" = "xyes"; then AC_MSG_CHECKING([which gtk+ version to compile examples against (optional)]) AC_ARG_WITH([gtk], AC_HELP_STRING([--with-gtk=3.0|2.0], [which gtk+ version to compile against (default: 2.0)]), [case "$with_gtk" in - 2.0|3.0) ;; + 2.0) GTK_REQ=$GTK2_REQ ;; + 3.0) GTK_REQ=$GTK3_REQ ;; *) AC_MSG_ERROR([invalid gtk+ version specified]);; esac], - [with_gtk=2.0]) - AC_MSG_RESULT([$with_gtk]) - PKG_CHECK_MODULES(GTK, gtk+-x11-$with_gtk, HAVE_GTK=yes, HAVE_GTK=no) + [with_gtk=2.0 + GTK_REQ=$GTK2_REQ]) + AC_MSG_RESULT([$with_gtk (>= $GTK_REQ)]) + PKG_CHECK_MODULES(GTK, gtk+-x11-$with_gtk >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no) + AC_SUBST(GTK_LIBS) + AC_SUBST(GTK_CFLAGS) fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") |