[svn-r24004] HDFFV-8319 and -8321: Cleanup autotools code.

Also remove GetConsoleScreenInfo check from cygwin configure.

Tested: h5committest

1 files changed, 12 insertions, 12 deletions

diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index d052046..1285541 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -36,15 +36,15 @@ HL="@HL@"
 ##                                                                        ##
 ## (Advanced usage - know what you're doing - you're on your own here.)   ##
 ## The three variables below can be used to insert paths and flags in     ##
-## FFLAGS, LDFLAGS, or LIBS in the h5fc compile line:                     ##
-##    $FLINKER $FFLAGS $H5BLD_FFLAGS $F9XSUFFIXFLAG $LDFLAGS $LIBS        ##
+## FCFLAGS, LDFLAGS, or LIBS in the h5fc compile line:                    ##
+##    $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $LIBS      ##
 ##    $fmodules $link_objs $link_args $shared_link                        ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_FFLAGS,                ##
+## These settings can be overriden by setting HDF5_FCFLAGS,               ##
 ## HDF5_LDFLAGS, or HDF5_LIBS in the environment.                         ##
 ##                                                                        ##
 ############################################################################
-FFLAGSBASE=""
+FCFLAGSBASE=""
 LDFLAGSBASE=""
 LIBSBASE=""
 
@@ -77,15 +77,15 @@ SHOW="eval"
 FCBASE="@FC@"
 FLINKERBASE="@FC@"
 
-# FFLAGS and LDFLAGS are reserved for use by the script user.  
+# FCFLAGS and LDFLAGS are reserved for use by the script user.  
 # FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS.
 
-# User's FFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
+# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
 # before clibpath, user's LIBS come after $link_objs and before the hdf5 
 # libraries in $link_args, followed by any external library paths and libraries 
 # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
 # The order of the flags is intended to give precedence to the user's flags.
-H5BLD_FFLAGS="@AM_FCFLAGS@ @FCFLAGS@"
+H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@"
 F9XMODFLAG="@F9XMODFLAG@"
 F9XSUFFIXFLAG="@F9XSUFFIXFLAG@"
 H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
@@ -93,7 +93,7 @@ H5BLD_LIBS="@LIBS@"
 
 FC="${HDF5_FC:-$FCBASE}"
 FLINKER="${HDF5_FLINKER:-$FLINKERBASE}"
-FFLAGS="${HDF5_FFLAGS:-$FFLAGSBASE}"
+FCFLAGS="${HDF5_FCFLAGS:-$FCFLAGSBASE}"
 LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
 LIBS="${HDF5_LIBS:-$LIBSBASE}"
 
@@ -140,7 +140,7 @@ usage() {
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
-  echo "  HDF5_FFLAGS           \"$CFLAGSBASE\""
+  echo "  HDF5_FCFLAGS          \"$CFLAGSBASE\""
   echo "  HDF5_LDFLAGS          \"$LDFLAGSBASE\""
   echo "  HDF5_LIBS             \"$LIBSBASE\""
   echo " "
@@ -287,7 +287,7 @@ if test "x$do_compile" = "xyes"; then
   fi
 
 
-  $SHOW $FC $H5BLD_FFLAGS $FFLAGS ${F9XSUFFIXFLAG} ${fmodules} $compile_args
+  $SHOW $FC $H5BLD_FCFLAGS $FCFLAGS ${F9XSUFFIXFLAG} ${fmodules} $compile_args
   status=$?
 
   if test "$status" != "0"; then
@@ -358,12 +358,12 @@ if test "x$do_link" = "xyes"; then
   # module. It's okay if they're included twice in the compile line.
   link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS"
 
-  # User's FFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
+  # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
   # before clibpath, user's LIBS come after $link_objs and before the hdf5 
   # libraries in $link_args, followed by any external library paths and libraries 
   # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
   # The order of the flags is intended to give precedence to the user's flags.
-  $SHOW $FLINKER $FFLAGS $H5BLD_FFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link
+  $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link
   status=$?
 fi