From b010b0fa92e55ec9c997613f2fce3168d0e98d4e Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 18 Aug 2016 13:06:39 +0300 Subject: distcheck: explicitly use currently selected GTK+ version --- Makefile.am | 4 +++- configure.ac | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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) -- cgit v1.2.1