From 6473cd8a85f89063620c6cfc88a4c2f9f815c7af Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Wed, 19 Mar 2025 14:33:08 +0100
Subject: [PATCH] Fix usage of --enable-XXX

---
 config/pac.m4 | 21 +++++++--------------
 configure     | 12 ++++--------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/config/pac.m4 b/config/pac.m4
index 98da0f6e..9a9a1b0f 100644
--- a/config/pac.m4
+++ b/config/pac.m4
@@ -380,7 +380,7 @@ AC_ARG_ENABLE(serial,
 AS_HELP_STRING([--enable-serial], 
 [Specify whether to enable a fake mpi library to run in serial mode. ]),
 [
-pac_cv_serial_mpi="yes";
+pac_cv_serial_mpi="$enableval";
 ]
 dnl ,
 dnl [pac_cv_serial_mpi="no";]
@@ -388,7 +388,6 @@ dnl [pac_cv_serial_mpi="no";]
 if test x"$pac_cv_serial_mpi" == x"yes" ; then
    AC_MSG_RESULT([yes.])
 else
- pac_cv_serial_mpi="no";
  AC_MSG_RESULT([no.])
 fi
 ]
@@ -410,12 +409,8 @@ AC_DEFUN([PAC_ARG_OPENMP],
 AC_ARG_ENABLE(openmp,
 AS_HELP_STRING([--enable-openmp], 
 [Specify whether to enable openmp. ]),
-[
-pac_cv_openmp="yes";
-]
-dnl ,
-dnl [pac_cv_openmp="no";]
-	     )
+[pac_cv_openmp="$enableval";])
+dnl AC_MSG_NOTICE([Result from test: "x$pac_cv_openmp"])
 if test x"$pac_cv_openmp" == x"yes" ; then
    AC_MSG_RESULT([yes.])
    AC_LANG_PUSH([Fortran])
@@ -455,7 +450,7 @@ AC_ARG_ENABLE(long-integers,
 AS_HELP_STRING([--enable-long-integers], 
 [Specify usage of 64 bits integers. ]),
 [
-pac_cv_long_integers="yes";
+pac_cv_long_integers="$enableval";
 ]
 dnl ,
 dnl [pac_cv_long_integers="no";]
@@ -2174,11 +2169,9 @@ AC_ARG_ENABLE(cuda,
 AS_HELP_STRING([--enable-cuda], 
 [Specify whether to enable cuda. ]),
 [
-pac_cv_cuda="yes";
+pac_cv_cuda="$enableval";
 ]
-dnl ,
-dnl [pac_cv_cuda="no";]
-	     )
+)
 ]
 )
 
@@ -2329,7 +2322,7 @@ AC_ARG_ENABLE(openacc,
 AS_HELP_STRING([--enable-openacc], 
 [Specify whether to enable openacc. ]),
 [
-pac_cv_openacc="yes";
+pac_cv_openacc="$enableval";
 ]
 dnl ,
 dnl [pac_cv_openacc="no";]
diff --git a/configure b/configure
index 7ea6582e..662dd77e 100755
--- a/configure
+++ b/configure
@@ -4626,7 +4626,7 @@ printf %s "checking whether we want serial  mpi stubs... " >&6; }
 if test ${enable_serial+y}
 then :
   enableval=$enable_serial;
-pac_cv_serial_mpi="yes";
+pac_cv_serial_mpi="$enableval";
 
 
 fi
@@ -4635,7 +4635,6 @@ if test x"$pac_cv_serial_mpi" == x"yes" ; then
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes." >&5
 printf "%s\n" "yes." >&6; }
 else
- pac_cv_serial_mpi="no";
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no." >&5
 printf "%s\n" "no." >&6; }
 fi
@@ -7443,10 +7442,7 @@ printf %s "checking whether we want openmp ... " >&6; }
 # Check whether --enable-openmp was given.
 if test ${enable_openmp+y}
 then :
-  enableval=$enable_openmp;
-pac_cv_openmp="yes";
-
-
+  enableval=$enable_openmp; pac_cv_openmp="$enableval";
 fi
 
 if test x"$pac_cv_openmp" == x"yes" ; then
@@ -10380,7 +10376,7 @@ printf %s "checking whether we want cuda ... " >&6; }
 if test ${enable_cuda+y}
 then :
   enableval=$enable_cuda;
-pac_cv_cuda="yes";
+pac_cv_cuda="$enableval";
 
 
 fi
@@ -10668,7 +10664,7 @@ printf %s "checking whether we want openacc ... " >&6; }
 if test ${enable_openacc+y}
 then :
   enableval=$enable_openacc;
-pac_cv_openacc="yes";
+pac_cv_openacc="$enableval";
 
 
 fi