gnucash master: Check the right variable in the right version of gdk to test for a Mac build.

John Ralls jralls at code.gnucash.org
Mon Jul 31 06:29:29 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/89336269 (commit)
	from  https://github.com/Gnucash/gnucash/commit/02763674 (commit)



commit 89336269d8fc102811d83aeaf0120d5678c38e4b
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jul 31 07:29:42 2017 +0100

    Check the right variable in the right version of gdk to test for a Mac build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d11240f..de2a926 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,7 +346,7 @@ ENDIF(WITH_OFX)
 
 IF(APPLE)
   EXECUTE_PROCESS(
-      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=target gdk-2.0
+      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=targets gdk-3.0
       OUTPUT_VARIABLE TARGET_RESULT
       OUTPUT_STRIP_TRAILING_WHITESPACE
   )
diff --git a/configure.ac b/configure.ac
index a54f375..ba46629 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,7 +414,7 @@ update to latest  darwin])
     AC_MSG_RESULT($platform)
     AC_MSG_CHECKING(For GDK-Quartz)
     platform=osx
-    _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
+    _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
     if test "x$_gdk_tgt" = xquartz; then
       platform=darwin/quartz
       AC_DEFINE(GNC_PLATFORM_COCOA, 1, [Cocoa/Nexstep/GnuStep framework])



Summary of changes:
 CMakeLists.txt | 2 +-
 configure.ac   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list