From 60c4f29e854382662e020029bcbd89ef3d5d21c8 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Fri, 24 Apr 2020 13:07:43 +0200
Subject: [PATCH] Further improvement to configure

---
 config/pac.m4 | 16 ++++++++--------
 configure     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/pac.m4 b/config/pac.m4
index 21db640f..eff7652a 100644
--- a/config/pac.m4
+++ b/config/pac.m4
@@ -817,9 +817,7 @@ if test "x$pac_sludist_lib_ok" == "xyes" ; then
 	       [mld2p4_cv_superludist_minor=`./conftest${ac_exeext} | sed 's/^ *//'`],
 	       [mld2p4_cv_superludist_minor="unknown"])
   AC_LANG_POP([C])
-  if test "x$pac_sludist_major" != "xunknown" ; then
-    AC_MSG_NOTICE([SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor.])
-  else 
+  if test "x$mld2p4_cv_superludist_major" == "xunknown" ; then
      AC_MSG_CHECKING([for superlu_dist version 4])
      AC_LANG_PUSH([C])
      ac_cc=${MPICC-$CC}
@@ -830,8 +828,8 @@ if test "x$pac_sludist_lib_ok" == "xyes" ; then
 			       int n; 
 			       LUstructInit(n, LUstruct);     
 			    }]])],
-	 [ AC_MSG_RESULT([yes]);   mld2p4_cv_superludist_major="4"; ],
-	 [ AC_MSG_RESULT([no]);    mld2p4_cv_superludist_major="3"; ])
+	 [ AC_MSG_RESULT([yes]);   mld2p4_cv_superludist_major="4"; mld2p4_cv_superludist_minor="";],
+	 [ AC_MSG_RESULT([no]);    mld2p4_cv_superludist_major="3"; mld2p4_cv_superludist_minor="";])
      AC_LANG_POP([C])
      if test "x$mld2p4_cv_superludist_major" == "x4" ; then
 	AC_MSG_CHECKING([for superlu_dist version 5])
@@ -844,11 +842,13 @@ if test "x$pac_sludist_lib_ok" == "xyes" ; then
 				       int n;
 				       set_default_options_dist(&options);
 				 }]])],
-	    [ AC_MSG_RESULT([yes]);  mld2p4_cv_superludist_major="5";],
-	    [ AC_MSG_RESULT([no]);   mld2p4_cv_superludist_major="4";])
+	    [ AC_MSG_RESULT([yes]);  mld2p4_cv_superludist_major="5";  mld2p4_cv_superludist_minor="";],
+	    [ AC_MSG_RESULT([no]);   mld2p4_cv_superludist_major="4";  mld2p4_cv_superludist_minor="";])
 	AC_LANG_POP([C])
      fi
-     fi
+   fi
+   AC_MSG_NOTICE([SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor.])
+
  else
     SLUDIST_LIBS="";
     SLUDIST_INCLUDES="";
diff --git a/configure b/configure
index 3183d74c..641132c7 100755
--- a/configure
+++ b/configure
@@ -9106,10 +9106,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "x$pac_sludist_major" != "xunknown" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&5
-$as_echo "$as_me: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&6;}
-  else
+  if test "x$mld2p4_cv_superludist_major" == "xunknown" ; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for superlu_dist version 4" >&5
 $as_echo_n "checking for superlu_dist version 4... " >&6; }
      ac_ext=c
@@ -9130,10 +9127,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };   mld2p4_cv_superludist_major="4";
+$as_echo "yes" >&6; };   mld2p4_cv_superludist_major="4"; mld2p4_cv_superludist_minor="";
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };    mld2p4_cv_superludist_major="3";
+$as_echo "no" >&6; };    mld2p4_cv_superludist_major="3"; mld2p4_cv_superludist_minor="";
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      ac_ext=c
@@ -9163,10 +9160,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };  mld2p4_cv_superludist_major="5";
+$as_echo "yes" >&6; };  mld2p4_cv_superludist_major="5";  mld2p4_cv_superludist_minor="";
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };   mld2p4_cv_superludist_major="4";
+$as_echo "no" >&6; };   mld2p4_cv_superludist_major="4";  mld2p4_cv_superludist_minor="";
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
@@ -9176,7 +9173,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      fi
-     fi
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&5
+$as_echo "$as_me: SuperLU_dist version $mld2p4_cv_superludist_major.$mld2p4_cv_superludist_minor." >&6;}
+
  else
     SLUDIST_LIBS="";
     SLUDIST_INCLUDES="";