Index: ../trunk-jpl/src/c/main/issm_dakota.cpp =================================================================== --- ../trunk-jpl/src/c/main/issm_dakota.cpp (revision 25665) +++ ../trunk-jpl/src/c/main/issm_dakota.cpp (revision 25666) @@ -40,7 +40,7 @@ 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,7 +89,7 @@ env.execute(); /* Run statistics if requested:*/ - #ifdef _SYSTEM_FMEMOPEN_ + #if _SYSTEM_HAS_FMEMOPEN_ == 1 if(statistics)DakotaStatistics(argc,argv); #endif Index: ../trunk-jpl/src/c/Makefile.am =================================================================== --- ../trunk-jpl/src/c/Makefile.am (revision 25665) +++ ../trunk-jpl/src/c/Makefile.am (revision 25666) @@ -353,10 +353,10 @@ ./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 Index: ../trunk-jpl/m4/issm_options.m4 =================================================================== --- ../trunk-jpl/m4/issm_options.m4 (revision 25665) +++ ../trunk-jpl/m4/issm_options.m4 (revision 25666) @@ -206,6 +206,7 @@ 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,8 +213,13 @@ 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])