From 2d932366b27af21b9197c882b4bf09f7c7bc973e Mon Sep 17 00:00:00 2001
From: "M. Scot Breitenfeld" <brtnfld@hdfgroup.org>
Date: Tue, 1 Aug 2017 15:33:43 -0500
Subject: added test for NAG compiler and use the FC_BASENAME for NAG
 detection, (HDFFV-10037)

---
 config/linux-gnulibc1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++---
 configure.ac          |  3 +--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 1785e0e..7cd1a2a 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -84,7 +84,20 @@ else
             $RM $tmpfile
             fc_version_info=`$FC -V | grep Absoft`
             ;;
-
+         # The NAG compiler
+	 nagfor*|nagftn*)
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $FC -V >& $tmpfile
+            if test -s "$tmpfile"; then
+                if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+                    FC_BASENAME=nagfor
+                fi
+            fi
+            fc_version_info=`grep "NAG Fortran" $tmpfile`
+            echo "compiler '$FC' is $fc_version_info"
+            $RM $tmpfile
+	    ;;
          *)
             ;;
     esac
@@ -108,10 +121,10 @@ case $FC_BASENAME in
     #
     f95)
         # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS" 
+        H5_CFLAGS="$H5_CFLAGS"
 
         F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
+# We force compiler to use upper case for external names
 # (just in case since this should be a default EIP)
         H5_FCFLAGS="$H5_FCFLAGS"
         FSEARCH_DIRS=""
@@ -136,6 +149,39 @@ case $FC_BASENAME in
 
         f9x_flags_set=yes
         ;;
+#
+#   NAG compiler
+#
+    nagfor)
+        # Set required flag for compiling C stubs
+        H5_CFLAGS="$H5_CFLAGS"
+
+        F9XSUFFIXFLAG=""
+# We force compiler to use upper case for external names
+# (just in case since this should be a default EIP)
+        H5_FCFLAGS="$H5_FCFLAGS"
+        FSEARCH_DIRS=""
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS=
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS=""
+
+        # Profiling
+        PROFILE_FCFLAGS=""
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS=
+        NO_OPT_FCFLAGS=
+
+        f9x_flags_set=yes
+        ;;
 
 esac  
 
@@ -230,6 +276,19 @@ case $FC in
     *pgf90*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
         ;;
+    *nagfor*|*nagftn*)
+        RM='rm -f'
+        tmpfile=/tmp/cmpver.$$
+        $FC -V >& $tmpfile
+        if test -s "$tmpfile"; then
+           if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+               FC_BASENAME=nagfor
+           fi
+        fi
+        fc_version_info=`grep "NAG Fortran" $tmpfile`
+        $RM $tmpfile
+        echo "compiler '$FC' is $fc_version_info"
+	;;
 
      *)
         echo "No match to get fc_version_info for $FC"
diff --git a/configure.ac b/configure.ac
index 47f5897..cf82a2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3348,8 +3348,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
     Linux*)
 
     fortran_linux_linker_option="-Wl,"
-	
-    if (grep -i 'NAG_Fortran' libtool > /dev/null); then
+    if test "X$FC_BASENAME" = "Xnagfor"; then
        fortran_linux_linker_option="-Wl,-Wl,,"
     fi
 
-- 
cgit v0.12