From fd04869ae4d4a3b0ebb9052557c296456bce7c0d Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Tue, 27 Sep 2016 14:14:11 -0500 Subject: [PATCH] Changed configure's 'omp' threading to 'openmp'. Details: - Changed the configure script so that the expected string argument to the -t (or --enable-threading=) option that enables OpenMP multithreading is 'openmp'. The previous expected string, 'omp', is still supported but should be considered deprecated. --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e0dc82c89..320f16e35 100755 --- a/configure +++ b/configure @@ -91,7 +91,7 @@ print_usage() echo " -t MODEL, --enable-threading[=MODEL], --disable-threading" echo " " echo " Enable threading in the library, using threading model" - echo " MODEL={omp,pthreads,no}. If MODEL=no or " + echo " MODEL={openmp,pthreads,no}. If MODEL=no or " echo " --disable-threading is specified, threading will be" echo " disabled. The default is 'no'." echo " " @@ -486,13 +486,15 @@ main() # Check the threading model flag. + # NOTE: 'omp' is deprecated but still supported; 'openmp' is preferred. enable_openmp='no' enable_openmp_01=0 enable_pthreads='no' enable_pthreads_01=0 if [ "x${threading_model}" = "xauto" ]; then echo "${script_name}: determining the threading model automatically." - elif [ "x${threading_model}" = "xomp" ]; then + elif [ "x${threading_model}" = "xopenmp" ] || + [ "x${threading_model}" = "xomp" ]; then echo "${script_name}: using OpenMP for threading." enable_openmp='yes' enable_openmp_01=1