Changeset 25647

Timestamp:

10/07/20 00:00:51 (5 years ago)

Author:

jdquinn

Message:

BUG: Bad commit

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

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

issm/trunk-jpl/src/c/Makefile.am

@@ -25 +25 @@
 #GLIBC sources {{{
 if MAC
-if !SYSTEM_FMEMOPEN
+if !SYSTEM_HAS_FMEMOPEN
 issm_sources += \
         ./ext/fmemopen/fmemopen.c