From 187a8c3051411c2b5357bd4379cc29b6e6af4210 Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Wed, 10 Jun 2026 13:51:54 +0200
Subject: [PATCH] Minor adjustments to configry

---
 config/pac.m4 | 22 ++--------------------
 configure     | 30 +++++++-----------------------
 configure.ac  |  6 +++---
 3 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/config/pac.m4 b/config/pac.m4
index 9cb556476..1b2d7b757 100644
--- a/config/pac.m4
+++ b/config/pac.m4
@@ -2223,6 +2223,7 @@ AS_HELP_STRING([--enable-cuda],
 pac_cv_cuda="$enableval";
 ]
 )
+AC_MSG_RESULT($pac_cv_cuda)
 ]
 )
 
@@ -2374,28 +2375,9 @@ AS_HELP_STRING([--enable-openacc],
 [Specify whether to enable openacc. ]),
 [
 pac_cv_openacc="$enableval";
+AC_MSG_RESULT([$enableval.])
 ]
-dnl ,
-dnl [pac_cv_openacc="no";]
 	     )
-if test x"$pac_cv_openacc" == x"yes" ; then
-   AC_MSG_RESULT([yes.])
-#   AC_LANG_PUSH([Fortran])
-#   AC_OPENACC() 
-#   pac_cv_openacc_fcopt="$OPENACC_FCFLAGS";
-#   AC_LANG_POP()
-#   AC_LANG_PUSH([C])
-#   AC_OPENACC() 
-#   pac_cv_openacc_ccopt="$OPENACC_CFLAGS";
-#   AC_LANG_POP()
-#   AC_LANG_PUSH([C++])
-#   AC_OPENACC() 
-#   pac_cv_openacc_cxxopt="$OPENACC_CXXFLAGS";
-#   AC_LANG_POP()
-else
- pac_cv_openacc="no";
- AC_MSG_RESULT([no.])
-fi
 ]
 )
 
diff --git a/configure b/configure
index e8a214af5..285e4aed1 100755
--- a/configure
+++ b/configure
@@ -9122,6 +9122,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
+AR="${AR} -cr"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9226,7 +9227,6 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-AR="$AR -cr"
 
 ###############################################################################
 #		BLAS  library presence checks
@@ -11287,6 +11287,8 @@ pac_cv_cuda="$enableval";
 
 fi
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pac_cv_cuda" >&5
+printf "%s\n" "$pac_cv_cuda" >&6; }
 
 
 if test "x$pac_cv_cuda" == "xyes"; then
@@ -11609,30 +11611,12 @@ if test ${enable_openacc+y}
 then :
   enableval=$enable_openacc;
 pac_cv_openacc="$enableval";
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enableval." >&5
+printf "%s\n" "$enableval." >&6; }
 
 
 fi
 
-if test x"$pac_cv_openacc" == x"yes" ; then
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes." >&5
-printf "%s\n" "yes." >&6; }
-#   AC_LANG_PUSH([Fortran])
-#   AC_OPENACC()
-#   pac_cv_openacc_fcopt="$OPENACC_FCFLAGS";
-#   AC_LANG_POP()
-#   AC_LANG_PUSH([C])
-#   AC_OPENACC()
-#   pac_cv_openacc_ccopt="$OPENACC_CFLAGS";
-#   AC_LANG_POP()
-#   AC_LANG_PUSH([C++])
-#   AC_OPENACC()
-#   pac_cv_openacc_cxxopt="$OPENACC_CXXFLAGS";
-#   AC_LANG_POP()
-else
- pac_cv_openacc="no";
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no." >&5
-printf "%s\n" "no." >&6; }
-fi
 
 
 if test x"$pac_cv_openacc" == x"yes" ; then
@@ -13523,7 +13507,7 @@ fi
 
         EXTRA_OPT             : ${EXTRA_OPT}
 
-	CUDA 		      : ${PSB_HAVE_CUDA}
+	CUDA 		      : ${pac_cv_cuda}
 	CUDA_CC               : ${pac_cv_cudacc}
 
 	OPENACC		      : ${pac_cv_openacc}
@@ -13565,7 +13549,7 @@ printf "%s\n" "$as_me:
 
         EXTRA_OPT             : ${EXTRA_OPT}
 
-	CUDA 		      : ${PSB_HAVE_CUDA}
+	CUDA 		      : ${pac_cv_cuda}
 	CUDA_CC               : ${pac_cv_cudacc}
 
 	OPENACC		      : ${pac_cv_openacc}
diff --git a/configure.ac b/configure.ac
index 1116417a9..db21073e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -955,11 +955,11 @@ if test x"$pac_cv_openacc" == x"yes" ; then
     dnl CXXOPENACC="$ax_cv_prog_cxx_openacc";	
     dnl FCOPENACC="$ax_cv_prog_fc_openacc";   
    dnl else   
-dnl   AC_MSG_NOTICE([OpenACC 1 flags CC $CCOPENACC CXX $CXXOPENACC FC $FCOPENACC])	   
+dnl   AC_MSG_NOTICE([OpenACC 1 flags CC $CCOPENACC CXX $CXXOPENACC FC $FCOPENACC])   
    PAC_ARG_WITH_FLAGS(ccopenacc,CCOPENACC)	
    PAC_ARG_WITH_FLAGS(cxxopenacc,CXXOPENACC)
    PAC_ARG_WITH_FLAGS(fcopenacc,FCOPENACC)
-dnl   AC_MSG_NOTICE([OpenACC 2 flags CC $CCOPENACC CXX $CXXOPENACC FC $FCOPENACC])		
+dnl   AC_MSG_NOTICE([OpenACC 2 flags CC $CCOPENACC CXX $CXXOPENACC FC $FCOPENACC])	
 dnl   CCOPENACC="$ax_cv_prog_c_openacc";
 dnl   CXXOPENACC="$ax_cv_prog_cxx_openacc";	
 dnl   FCOPENACC="$ax_cv_prog_fc_openacc";   
@@ -1193,7 +1193,7 @@ AC_MSG_NOTICE([
 
         EXTRA_OPT             : ${EXTRA_OPT}
 
-	CUDA 		      : ${PSB_HAVE_CUDA}
+	CUDA 		      : ${pac_cv_cuda}
 	CUDA_CC               : ${pac_cv_cudacc}
 
 	OPENACC		      : ${pac_cv_openacc}