[gimp/osx-build: 16/44] configure: Also search for the -gtk2 version of mac integration
- From: Sven Claussner <sclaussner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/osx-build: 16/44] configure: Also search for the -gtk2 version of mac integration
- Date: Sun, 22 Jun 2014 19:08:08 +0000 (UTC)
commit 833049c7eb4b903b1e8edd572bdb4a65b2ed0daf
Author: Daniel Sabo <DanielSabo gmail com>
Date: Wed Mar 19 19:03:21 2014 -0700
configure: Also search for the -gtk2 version of mac integration
If a suffixed version is not found it will still fall back to
searching for the old version.
Cherry-picked and adapted to gimp-2-8 from
f6533db8b739b95ca5d71c2d5ac2b28c54c650bf
Resolved conflicts:
configure.ac
configure.ac | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ba0beb0..5b5803f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ m4_define([exif_required_version], [0.6.15])
m4_define([lcms1_required_version], [1.16])
m4_define([lcms2_required_version], [2.2])
m4_define([libpng_required_version], [1.2.37])
-m4_define([gtk_mac_integration_required_version], [1.0.1])
+m4_define([gtk_mac_integration_required_version], [2.0.0])
# Current test considers only 2 version numbers. If we update the recommended
@@ -1936,9 +1936,19 @@ AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" = xyes)
# Check for GTK Mac Integration
###############################
+gtk_mac_integration_ok=no
if test "x$platform_osx" != xno &&
test "x`$PKG_CONFIG --variable=target gtk+-2.0`" == "xquartz"; then
- PKG_CHECK_MODULES(GTK_MAC_INTEGRATION, gtk-mac-integration >= gtk_mac_integration_required_version)
+
+ PKG_CHECK_MODULES(GTK_MAC_INTEGRATION, gtk-mac-integration-gtk2 >= gtk_mac_integration_required_version,
+ gtk_mac_integration_ok=yes,
+ gtk_mac_integration_ok=no)
+
+ if test "x$gtk_mac_integration_ok" != "xyes"; then
+ PKG_CHECK_MODULES(GTK_MAC_INTEGRATION, gtk-mac-integration >= gtk_mac_integration_required_version,
+ gtk_mac_integration_ok=yes,
+ gtk_mac_integration_ok=no)
+ fi
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]