source: issm/oecreview/Archive/24684-25833/ISSM-25665-25666.diff

../trunk-jpl/src/c/main/issm_dakota.cpp

@@ -40 +40 @@
         sprintf(dakota_error_file,"%s/%s%s",argv[2],argv[3],".qmu.err");
 
         /*Create directory structure for model outputs:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         statistics=DakotaDirStructure(argc,argv);
         #endif
 
@@ -89 +89 @@
         env.execute();
 
         /* Run statistics if requested:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         if(statistics)DakotaStatistics(argc,argv);
         #endif
 

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

@@ -353 +353 @@
         ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp \
         ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp \
         ./cores/dakota_core.cpp
-        if SYSTEM_FMEMOPEN
-                issm_sources += ./modules/QmuStatisticsx/QmuStatisticsx.cpp
-        fi
+if SYSTEM_HAS_FMEMOPEN
+issm_sources += ./modules/QmuStatisticsx/QmuStatisticsx.cpp
 endif
+endif
 #}}}
 #Petsc sources  {{{
 if PETSC

../trunk-jpl/m4/issm_options.m4

@@ -206 +206 @@
 
         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)
+        AC_MSG_CHECKING([if system copy of libc has fmemopen])
         SYSTEM_FMEMOPEN=1
         if test "${IS_MAC}" == "yes"; then
                 if [[ $(system_profiler SPSoftwareDataType | $(which grep) "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -lt 13 ]]; then
@@ -212 +213 @@
                         SYSTEM_FMEMOPEN=0
                 fi
         fi
-        AC_DEFINE(_SYSTEM_FMEMOPEN_, ${SYSTEM_FMEMOPEN}, [does system libc have fmemopen])
-        AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test ${SYSTEM_FMEMOPEN} == 1])
+        if test "${SYSTEM_FMEMOPEN}" == "1"; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+        fi
+        AC_DEFINE_UNQUOTED([_SYSTEM_HAS_FMEMOPEN_], $SYSTEM_FMEMOPEN, [does system copy of libc have fmemopen])
+        AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test "${SYSTEM_FMEMOPEN}" == "1"])
 
         IS_WINDOWS=no
         AC_MSG_CHECKING([for vendor compilers])