Extreme streamlining of fortran package macro.

build/pkgs/gfortran/spkg-configure.m4

@@ -1,30 +1,20 @@
 SAGE_SPKG_CONFIGURE([gfortran], [
-    AC_REQUIRE([AC_PROG_FC])
     AC_REQUIRE([SAGE_SPKG_CONFIGURE_GCC])
+    AC_REQUIRE([AC_PROG_FC])
+    # Check that the Fortran compiler accepts free-format source code (as
+    # opposed to the older fixed-format style from Fortran 77).
+    # This helps verify the compiler works too, so if some idiot sets FC to
+    # /usr/bin/ls, we will at least know it's not a working Fortran
+    # compiler.
+    AC_FC_FREEFORM([], [
+	AC_MSG_NOTICE([Your Fortran compiler does not accept free-format source code])
+        AC_MSG_NOTICE([which means the compiler is either seriously broken, or])
+        AC_MSG_NOTICE([is too old to build Sage.])
+        sage_spkg_install_gfortran=yes])
 
     # Special case: If we are already installing gcc then don't install
     # gfortran since it's included
     if test "x$sage_spkg_install_gcc" = "xyes" -o x$SAGE_INSTALL_GCC = xexists; then
         sage_spkg_install_gfortran=no
-    else
-        # Check that the Fortran compiler accepts free-format source code (as
-        # opposed to the older fixed-format style from Fortran 77).
-        # This helps verify the compiler works too, so if some idiot sets FC to
-        # /usr/bin/ls, we will at least know it's not a working Fortran
-        # compiler.
-        if test -z "$FC"; then
-            sage_spkg_install_gfortran=yes
-            AC_MSG_NOTICE([A Fortran compiler couldn't be found])
-            AC_MSG_NOTICE([gfortran will be built])
-        else
-        # see http://www.gnu.org/software/hello/manual/autoconf/Fortran-Compiler.html
-            AC_FC_FREEFORM([], [
-                AC_MSG_NOTICE([Your Fortran compiler does not accept free-format source code])
-                AC_MSG_NOTICE([which means the compiler is either seriously broken, or])
-                AC_MSG_NOTICE([is too old to build Sage.])
-                AC_MSG_NOTICE([gfortran will be built])
-                sage_spkg_install_gfortran=yes
-            ])
-        fi
     fi
 ])