[metacity] configure.ac: remove GTK_API_VERSION
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] configure.ac: remove GTK_API_VERSION
- Date: Sun, 20 Sep 2015 18:10:34 +0000 (UTC)
commit bc32ff64ee2f36926fd18c5bb12c52c6ad006501
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Sep 20 05:49:11 2015 +0300
configure.ac: remove GTK_API_VERSION
configure.ac | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f12dc0..246ec4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,13 +77,11 @@ AC_CHECK_SIZEOF(__int64)
## byte order
AC_C_BIGENDIAN
-GTK_API_VERSION=3.0
GTK_MIN_VERSION=3.15.2
GIO_MIN_VERSION=2.25.10
CANBERRA_GTK=libcanberra-gtk3
-METACITY_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0
gsettings-desktop-schemas >= 3.3.0"
-AC_SUBST(GTK_API_VERSION)
+METACITY_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0
gsettings-desktop-schemas >= 3.3.0"
GLIB_GSETTINGS
@@ -134,8 +132,8 @@ AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.36.0 gthread-2.0 >= 2.32.0)
# gtk_window_set_icon_name requires gtk2+-2.60
-PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
echo "pangoxft found"
@@ -425,7 +423,7 @@ fi
dnl ==========================================================================
echo "
-metacity-$VERSION (using gtk+-${GTK_API_VERSION}):
+metacity-$VERSION:
prefix: ${prefix}
source code location: ${srcdir}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]