summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-08-18 13:06:39 +0300
committermonsta <[email protected]>2016-08-18 13:17:47 +0300
commitb010b0fa92e55ec9c997613f2fce3168d0e98d4e (patch)
treea286a8bf3758c8aec50d771429960611c6ed8c04
parentf16603aafe8389f4d4d82954db5ac7f1ed37b283 (diff)
downloadmate-user-share-b010b0fa92e55ec9c997613f2fce3168d0e98d4e.tar.bz2
mate-user-share-b010b0fa92e55ec9c997613f2fce3168d0e98d4e.tar.xz
distcheck: explicitly use currently selected GTK+ version
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index ae78a5f..cea5ae5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ DISTCLEANFILES = \
intltool-merge \
intltool-update
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck'
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
+ --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' \
+ --with-gtk=$(GTK_API_VERSION)
# Build ChangeLog from GIT history
ChangeLog:
diff --git a/configure.ac b/configure.ac
index fbb911b..80ac466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,8 @@ case "$with_gtk" in
;;
esac
+AC_SUBST(GTK_API_VERSION)
+
dnl ==========================================================================
PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG)