TRILAB-192 merging warnings changes from develop

config/linux-gnulibc1

@@ -49,7 +49,7 @@ if test "X-" = "X-$FC"; then
             FC=gfortran
             FC_BASENAME=gfortran
             ;;
-	pgcc*)
+        pgcc*)
             FC=pgf90
             FC_BASENAME=pgf90
             ;;
@@ -98,12 +98,14 @@ else
             echo "compiler '$FC' is $fc_version_info"
             $RM $tmpfile
 	    ;;
-
          *)
             ;;
     esac
 fi
 
+# Figure out GNU FC compiler flags
+. $srcdir/config/gnu-fflags
+
 # Figure out PGI FC compiler flags
 . $srcdir/config/pgi-fflags
 
@@ -119,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=""
@@ -173,6 +175,9 @@ if test -z "$CXX"; then
   CXX_BASENAME=g++
 fi
 
+# Figure out GNU CXX compiler flags
+. $srcdir/config/gnu-cxxflags
+
 # compiler version strings
 
 # check if the compiler_version_info is already set