From 85483fe47a0323cb7b5ae3877bfb96ca32698abc Mon Sep 17 00:00:00 2001
From: Ryan Hill <rchrys.hill@gmail.com>
Date: Wed, 14 Aug 2024 14:07:59 +0100
Subject: [PATCH 1/2] ADD: Report the CXX and CXXLD difference from grid-config

---
 configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c3f1407..8c6cd4f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,12 +24,14 @@ fi
 if test x"$CXX" == x ; then
     CXX="`grid-config --cxx`"
 elif test "$CXX" != "`grid-config --cxx`" ; then
-    AC_MSG_WARN([CXX differs from that reported by grid-config])
+    GRID_CXX="`grid-config --cxx`"
+    AC_MSG_WARN([CXX differs from that reported by grid-config: "$CXX" vs "$GRID_CXX"])
 fi
 if test x"$CXXLD" == x ; then
     CXXLD="`grid-config --cxxld`"
 elif test "$CXXLD" != "`grid-config --cxxld`" ; then
-    AC_MSG_WARN([CXXLD differs from that reported by grid-config])
+    GRID_CXXLD="`grid-config --cxxld`"
+    AC_MSG_WARN([CXXLD differs from that reported by grid-config: "$CXXLD" vs "$GRID_CXXLD"])
 fi
 CXXFLAGS="$CXXFLAGS `grid-config --cxxflags`"
 CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"

From 34d7e3b8e128e8e812e49ece8c6bf53a8993a7be Mon Sep 17 00:00:00 2001
From: Ryan Hill <rchrys.hill@gmail.com>
Date: Wed, 14 Aug 2024 14:09:59 +0100
Subject: [PATCH 2/2] ADD: Report the CXX and CXXLD difference from
 hadrons-config in ApplicationTemplate

---
 application-template/configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application-template/configure.ac b/application-template/configure.ac
index e8fcc459..f41dcbe4 100644
--- a/application-template/configure.ac
+++ b/application-template/configure.ac
@@ -28,12 +28,14 @@ fi
 if test x"$CXX" == x ; then
     CXX="`hadrons-config --cxx`"
 elif test "$CXX" != "`hadrons-config --cxx`" ; then
-    AC_MSG_WARN([CXX differs from that reported by hadrons-config])
+    HADRONS_CXX="`hadrons-config --cxx`"
+    AC_MSG_WARN([CXX differs from that reported by hadrons-config: "$CXX" vs "$HADRONS_CXX"])
 fi
 if test x"$CXXLD" == x ; then
     CXXLD="`hadrons-config --cxxld`"
 elif test "$CXXLD" != "`hadrons-config --cxxld`" ; then
-    AC_MSG_WARN([CXXLD differs from that reported by hadrons-config])
+    HADRONS_CXXLD="`hadrons-config --cxxld`"
+    AC_MSG_WARN([CXXLD differs from that reported by hadrons-config: "$CXXLD" vs "$HADRONS_CXXLD"])
 fi
 
 # Checks for programs.