Changeset 25646

Timestamp:

10/06/20 20:43:23 (4 years ago)

Author:

jdquinn

Message:

BUG: Again trying to supplement macOS implementations of libc that do not have fmemopen

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -195 +195 @@
                 *darwin*)
                         IS_MAC=yes
+                        AC_DEFINE([_MAC_], [1], [is macOS])
                 ;;
                 *)
                         IS_MAC=no
+                        AC_DEFINE([_MAC_], [0], [is macOS])
                 ;;
         esac
@@ -204 +206 @@
 
         if test "${IS_MAC}" == "yes"; then
-                AC_MSG_CHECKING([for fmemopen])
-                FMEMOPEN=no
+                AC_MSG_CHECKING([if system lib.c has fmemopen])
                 if [[ $(system_profiler SPSoftwareDataType | $(which grep) "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -ge 13 ]]; then
-                        FMEMOPEN=yes
-                fi
-                AM_CONDITIONAL([HAS_FMEMOPEN], [test "${FMEMOPEN}" == "yes"])
-                AC_MSG_RESULT([${FMEMOPEN}])
+                        SYSTEM_FMEMOPEN="yes"
+                        AC_DEFINE([_SYSTEM_FMEMOPEN_], [1], [does system lib.c have fmemopen])
+                else
+                        SYSTEM_FMEMOPEN="no"
+                        AC_DEFINE([_SYSTEM_FMEMOPEN_], [0], [does system lib.c have fmemopen])
+                fi
+                AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test "${SYSTEM_FMEMOPEN}" == "yes"])
+                AC_MSG_RESULT([${SYSTEM_FMEMOPEN}])
         fi