Skip to content

Commit

Permalink
configure updates
Browse files Browse the repository at this point in the history
  • Loading branch information
michellepistner committed May 22, 2024
1 parent 897fbe2 commit 60c70ee
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
23 changes: 13 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 60c70ee

Please sign in to comment.