diff options
| author | John Ralls <jralls@ceridwen.us> | 2017-04-29 10:37:46 -0700 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2017-04-30 21:36:52 +0200 |
| commit | fe99895f8d3b61409c416f1244a29f2aa3478f96 (patch) | |
| tree | 445c6be6bcc364d27db21a7ad3798fc8916100a2 | |
| parent | 4ba762ab78b54811f722ce0da8b77325b6556bbd (diff) | |
| download | glibmm-fe99895f8d3b61409c416f1244a29f2aa3478f96.tar.gz | |
Bug 781947 - Build fails on MacOS because glib doesn't have gdesktopinfo.
Disable building desktopapinfo.cpp with the same test used in glib.
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | gio/src/filelist.am | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4877b193..c9cb0a63 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,18 @@ AS_CASE([$host_os], [mingw*], [glibmm_host_windows=yes], [glibmm_host_windows=no AC_MSG_RESULT([$glibmm_host_windows]) AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$glibmm_host_windows" = xyes]) +glib_have_cocoa=no +AC_MSG_CHECKING([for Mac OS X Cocoa support]) +AC_TRY_CPP([ +#include <Cocoa/Cocoa.h> +#ifdef GNUSTEP_BASE_VERSION +#error "Detected GNUstep, not Cocoa" +#endif +], glib_have_cocoa=yes) + +AC_MSG_RESULT([$glib_have_cocoa]) +AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"]) + # TODO: This makes no sense. --danielk AS_IF([test "x$enable_static" = xyes], [ diff --git a/gio/src/filelist.am b/gio/src/filelist.am index 0095128e..31339d38 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -136,7 +136,6 @@ giomm_files_any_hg = \ zlibcompressor.hg giomm_files_posix_hg = \ - desktopappinfo.hg \ unixconnection.hg \ unixcredentialsmessage.hg \ unixfdlist.hg \ @@ -145,10 +144,17 @@ giomm_files_posix_hg = \ unixoutputstream.hg \ unixsocketaddress.hg +giomm_files_not_mac = \ + desktopappinfo.hg + if HOST_WINDOWS_NATIVE giomm_files_arch_hg = else +if OS_COCOA giomm_files_arch_hg = $(giomm_files_posix_hg) +else +giomm_files_arch_hg = $(giomm_files_not_mac) $(giomm_files_posix_hg) +endif endif giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg) |