From 60c70ee5369830d326bc4d31864e8c319fe2e5b0 Mon Sep 17 00:00:00 2001 From: michellepistner Date: Wed, 22 May 2024 10:36:01 -0400 Subject: [PATCH] configure updates --- configure | 23 +++++++++++++---------- configure.ac | 6 +++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 0921c53..57ea9ca 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for fido 1.1.0 . +# Generated by GNU Autoconf 2.72 for fido 1.1.0. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, @@ -600,8 +600,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='fido' PACKAGE_TARNAME='fido' -PACKAGE_VERSION='1.1.0 ' -PACKAGE_STRING='fido 1.1.0 ' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='fido 1.1.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures fido 1.1.0 to adapt to many kinds of systems. +'configure' configures fido 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1281,7 +1281,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fido 1.1.0 :";; + short | recursive ) echo "Configuration of fido 1.1.0:";; esac cat <<\_ACEOF @@ -1478,7 +1478,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fido $as_me 1.1.0 , which was +It was created by fido $as_me 1.1.0, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -3270,6 +3270,8 @@ fi cd "${owd}" rm -rf "${BUILDDIR}" + + ## additional reporting/diagnostics for mac don't trust the above approach for mac RSysinfoName=$("${R_HOME}/bin/Rscript" --vanilla -e 'cat(Sys.info()["sysname"])') { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mac OS" >&5 @@ -3283,6 +3285,7 @@ else printf "%s\n" "not found" >&6; } fi # end mac check + ## If the above checks failed, then perform other heuristics ## based on the compiler version, etc. if test x"${openmp_already_works}" = x"no"; then @@ -3421,7 +3424,7 @@ openmp_flag="" arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" if test x"${openmp_already_works}" = x"yes"; then - arma_have_openmp="#define ARMA_USE_OPENMP 1" + arma_have_openmp="#define ARMA_USE_OPENMP" ## Added by JDS openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' fi @@ -3435,11 +3438,11 @@ printf %s "checking for OpenMP... " >&6; } if test x"${hasOpenMP}" = x""; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: missing" >&5 printf "%s\n" "missing" >&6; } - arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" + arma_have_openmp="#define ARMA_DONT_USE_OPENMP" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found and suitable" >&5 printf "%s\n" "found and suitable" >&6; } - arma_have_openmp="#define ARMA_USE_OPENMP 1" + arma_have_openmp="#define ARMA_USE_OPENMP" openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' fi fi @@ -3990,7 +3993,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fido $as_me 1.1.0 , which was +This file was extended by fido $as_me 1.1.0, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES diff --git a/configure.ac b/configure.ac index 6a11f79..43903ce 100644 --- a/configure.ac +++ b/configure.ac @@ -187,7 +187,7 @@ openmp_flag="" arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" if test x"${openmp_already_works}" = x"yes"; then - arma_have_openmp="#define ARMA_USE_OPENMP 1" + arma_have_openmp="#define ARMA_USE_OPENMP" ## Added by JDS openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' fi @@ -199,10 +199,10 @@ if test x"${can_use_openmp}" = x"yes"; then hasOpenMP=$(echo ${allldflags} | grep -- -fopenmp) if test x"${hasOpenMP}" = x""; then AC_MSG_RESULT([missing]) - arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" + arma_have_openmp="#define ARMA_DONT_USE_OPENMP" else AC_MSG_RESULT([found and suitable]) - arma_have_openmp="#define ARMA_USE_OPENMP 1" + arma_have_openmp="#define ARMA_USE_OPENMP" openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' fi fi