[gimp] configure: Also search for the -gtk2 version of mac integration
- From: Daniel Sabo <daniels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] configure: Also search for the -gtk2 version of mac integration
- Date: Thu, 20 Mar 2014 04:23:01 +0000 (UTC)
commit f6533db8b739b95ca5d71c2d5ac2b28c54c650bf
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.
configure.ac | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 28a15ce..fa8cbd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ m4_define([lcms_required_version], [2.2])
m4_define([libpng_required_version], [1.2.37])
m4_define([liblzma_required_version], [5.0.0])
m4_define([openexr_required_version], [1.6.1])
-m4_define([gtk_mac_integration_required_version], [1.0.1])
+m4_define([gtk_mac_integration_required_version], [2.0.0])
m4_define([intltool_required_version], [0.40.1])
AC_INIT([GIMP], [gimp_version],
@@ -1805,9 +1805,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]