Changeset 25666

Timestamp:

10/09/20 01:12:19 (4 years ago)

Author:

jdquinn

Message:

BUG: What should be final fix for fmemopen issue

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/c/Makefile.am (modified) (1 diff)
• src/c/main/issm_dakota.cpp (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -207 +207 @@
         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
@@ -213 +214 @@
                 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

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

@@ -354 +354 @@
         ./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
 #}}}

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

@@ -41 +41 @@
 
         /*Create directory structure for model outputs:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         statistics=DakotaDirStructure(argc,argv);
         #endif
@@ -90 +90 @@
 
         /* Run statistics if requested:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         if(statistics)DakotaStatistics(argc,argv);
         #endif