Changeset 25658

Timestamp:

10/08/20 12:19:20 (4 years ago)

Author:

jdquinn

Message:

CHG: Removed special handling for fmemopen

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/ext (deleted)
• src/c/modules/QmuStatisticsx/QmuStatisticsx.h (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -204 +204 @@
         AM_CONDITIONAL([MAC], [test "${IS_MAC}" == "yes"])
         AC_MSG_RESULT([${IS_MAC}])
-
-        dnl If macOS, check if system copy of libc has fmemopen (if it is not 
-        dnl macOS, we do not check, but still must set SYSTEM_HAS_FMEMOPEN)
-        SYSTEM_FMEMOPEN="no"
-        if test "${IS_MAC}" == "yes"; then
-                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 libc have fmemopen])
-                else
-                        AC_DEFINE([_SYSTEM_FMEMOPEN_], [0], [does system libc have fmemopen])
-                fi
-        fi
-        AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test "${SYSTEM_FMEMOPEN}" == "yes"])
-        AC_MSG_RESULT([${SYSTEM_FMEMOPEN}])
 
         IS_WINDOWS=no

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

@@ -22 +22 @@
 #Core sources
 issm_sources =
-
-#GLIBC sources {{{
-if MAC
-if !SYSTEM_HAS_FMEMOPEN
-issm_sources += \
-        ./ext/fmemopen/fmemopen.c
-endif
-endif
-#}}}
 
 #BAMG sources  {{{

issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.h

@@ -6 +6 @@
 
 #include "../../classes/classes.h"
-
-#if _MAC_ && !_SYSTEM_FMEMOPEN_
-#include "../../ext/fmemopen/fmemopen.h"
-#endif
 
 int ComputeMeanVariance(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm);