changeset 2128:17f5c1c199b4

Mac: Switch to using -weak_framework UserNotifications so binaries will work pre-Mojave when built on Mojave (10.14) or later.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 30 Jun 2020 17:47:07 +0000
parents 663467f6eee4
children 2fb132a1d1fa
files configure configure.in
diffstat 2 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Jun 28 20:34:25 2020 +0000
+++ b/configure	Tue Jun 30 17:47:07 2020 +0000
@@ -712,7 +712,6 @@
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -801,7 +800,6 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1054,15 +1052,6 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1200,7 +1189,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1353,7 +1342,6 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -4659,7 +4647,7 @@
       DW_DEFINE=__MAC__
       LIBS="$LIBS -framework Cocoa -framework WebKit"
       save_libs="$LIBS"
-      LIBS="$LIBS -framework UserNotifications"
+      LIBS="$LIBS -weak_framework UserNotifications"
       INSTALL_TEST=""
       ac_fn_c_check_func "$LINENO" "exit" "ac_cv_func_exit"
 if test "x$ac_cv_func_exit" = xyes; then :
--- a/configure.in	Sun Jun 28 20:34:25 2020 +0000
+++ b/configure.in	Tue Jun 30 17:47:07 2020 +0000
@@ -145,7 +145,7 @@
       DW_DEFINE=__MAC__
       LIBS="$LIBS -framework Cocoa -framework WebKit"
       save_libs="$LIBS"
-      LIBS="$LIBS -framework UserNotifications"
+      LIBS="$LIBS -weak_framework UserNotifications"
       INSTALL_TEST=""
       AC_CHECK_FUNC(exit, , [LIBS="$save_libs"])
       build_gtk="no"