[SCM] GNU Autoconf source repository branch, master, updated. v2.68-49-g1ab552e

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=1ab552e4a8d418c3b92dc31c079454e227586dcf

The branch, master has been updated
       via  1ab552e4a8d418c3b92dc31c079454e227586dcf (commit)
       via  1c78dd25cd4110301930bb36c78369c13cbeb93e (commit)
       via  0542805c543c4b1401449cf811545805c90fe2d8 (commit)
       via  4659f061468726cfdf5a69e82406efe5fb473690 (commit)
      from  e143d9ce7cd79631900bb596e365a1d531aa4e82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ab552e4a8d418c3b92dc31c079454e227586dcf
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Mar 4 21:26:08 2011 +0100

    Update known compiler switches for Fortran and OpenMP macros.
    
    * lib/autoconf/c.m4 (AC_OPENMP): Update for Lahey on GNU/Linux.
    * lib/autoconf/fortran.m4 (_AC_F95_FC): Also try nagfor.
    (_AC_PROG_FC_V): Update documentation for Lahey switches.
    (AC_FC_FREEFORM, AC_FC_FIXEDFORM): Add flags for Absoft, Lahey
    on GNU/Linux, document NAGWare, g95, and f2c switches.
    (AC_FC_LINE_LENGTH): Document NAGware switch.  Update Absoft,
    Lahey, NAGWare, Open Watcom, g95, and f2c switches.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 1c78dd25cd4110301930bb36c78369c13cbeb93e
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Mar 4 21:25:06 2011 +0100

    tests: accept f2c/fort77 as GNU Fortran 77.
    
    * tests/fortran.at (GNU Fortran 77): Try to detect f2c wrapper
    fort77 as GNU as well: it defines __GNUC__ too.  Fixes testsuite
    failure when f77 is fort77.
    Report from Giulio Paci.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 0542805c543c4b1401449cf811545805c90fe2d8
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Mar 4 21:24:32 2011 +0100

    docs: macro synopses document default failure cases.
    
    * doc/autoconf.texi (Fortran Compiler, Obsolete Macros):
    Document failure case for AC_F77_DUMMY_MAIN, AC_FC_DUMMY_MAIN,
    AC_FC_SRCEXT, AC_FC_FREEFORM, AC_FC_FIXEDFORM,
    AC_FC_LINE_LENGTH, and AC_TRY_RUN macros.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 4659f061468726cfdf5a69e82406efe5fb473690
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Mar 4 21:23:49 2011 +0100

    Reword Fortran macro documentation.
    
    * doc/autoconf.texi (Fortran Compiler): Improve wording for
    AC_FC_FREEFORM, AC_FC_FIXEDFORM, and AC_FC_LINE_LENGTH macros.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   27 +++++++++++++++++++++++++++
 doc/autoconf.texi       |   44 +++++++++++++++++++++++---------------------
 lib/autoconf/c.m4       |    4 +++-
 lib/autoconf/fortran.m4 |   36 +++++++++++++++++++++++-------------
 tests/fortran.at        |   12 +++++++-----
 5 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf72bd1..fa0b5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-03-04  Ralf Wildenhues  <address@hidden>
+
+       Update known compiler switches for Fortran and OpenMP macros.
+       * lib/autoconf/c.m4 (AC_OPENMP): Update for Lahey on GNU/Linux.
+       * lib/autoconf/fortran.m4 (_AC_F95_FC): Also try nagfor.
+       (_AC_PROG_FC_V): Update documentation for Lahey switches.
+       (AC_FC_FREEFORM, AC_FC_FIXEDFORM): Add flags for Absoft, Lahey
+       on GNU/Linux, document NAGWare, g95, and f2c switches.
+       (AC_FC_LINE_LENGTH): Document NAGware switch.  Update Absoft,
+       Lahey, NAGWare, Open Watcom, g95, and f2c switches.
+
+       tests: accept f2c/fort77 as GNU Fortran 77.
+       * tests/fortran.at (GNU Fortran 77): Try to detect f2c wrapper
+       fort77 as GNU as well: it defines __GNUC__ too.  Fixes testsuite
+       failure when f77 is fort77.
+       Report from Giulio Paci.
+
+       docs: macro synopses document default failure cases.
+       * doc/autoconf.texi (Fortran Compiler, Obsolete Macros):
+       Document failure case for AC_F77_DUMMY_MAIN, AC_FC_DUMMY_MAIN,
+       AC_FC_SRCEXT, AC_FC_FREEFORM, AC_FC_FIXEDFORM,
+       AC_FC_LINE_LENGTH, and AC_TRY_RUN macros.
+
+       Reword Fortran macro documentation.
+       * doc/autoconf.texi (Fortran Compiler): Improve wording for
+       AC_FC_FREEFORM, AC_FC_FIXEDFORM, and AC_FC_LINE_LENGTH macros.
+
 2011-02-27  Ralf Wildenhues  <address@hidden>
 
        config.status: do not quote $SHELL when rerunning configure.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index b011316..5fc9ffe 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -7969,8 +7969,10 @@ because the complex defines that the function wrapper 
macros create
 may not work with C/C++ compiler drivers.
 @end defmac
 
address@hidden AC_F77_DUMMY_MAIN (@ovar{action-if-found}, 
@ovar{action-if-not-found})
address@hidden AC_FC_DUMMY_MAIN (@ovar{action-if-found}, 
@ovar{action-if-not-found})
address@hidden AC_F77_DUMMY_MAIN (@ovar{action-if-found}, 
@dvar{action-if-not-found, @
+  AC_MSG_FAILURE})
address@hidden AC_FC_DUMMY_MAIN (@ovar{action-if-found}, 
@dvar{action-if-not-found, @
+  AC_MSG_FAILURE})
 @acindex{F77_DUMMY_MAIN}
 @cvindex F77_DUMMY_MAIN
 @acindex{FC_DUMMY_MAIN}
@@ -8140,7 +8142,7 @@ to call Fortran routines from some language other than 
C/C++.
 @end defmac
 
 @defmac AC_FC_SRCEXT (@var{ext}, @ovar{action-if-success}, @
-  @ovar{action-if-failure})
+  @dvar{action-if-failure, AC_MSG_FAILURE})
 @acindex{FC_SRCEXT}
 By default, the @code{FC} macros perform their tests using a @file{.f}
 extension for source-code files.  Some compilers, however, only enable
@@ -8184,13 +8186,13 @@ error message).
 
 @end defmac
 
address@hidden AC_FC_FREEFORM (@ovar{action-if-success}, 
@ovar{action-if-failure})
address@hidden AC_FC_FREEFORM (@ovar{action-if-success}, 
@dvar{action-if-failure, @
+  AC_MSG_FAILURE})
 @acindex{FC_FREEFORM}
 
-The @code{AC_FC_FREEFORM} tries to ensure that the Fortran compiler
-(@code{$FC}) allows free-format source code (as opposed to the older
-fixed-format style from Fortran 77).  If necessary, it may add some
-additional flags to @code{FCFLAGS}.
+Try to ensure that the Fortran compiler (@code{$FC}) allows free-format
+source code (as opposed to the older fixed-format style from Fortran
+77).  If necessary, it may add some additional flags to @code{FCFLAGS}.
 
 This macro is most important if you are using the default @file{.f}
 extension, since many compilers interpret this extension as indicating
@@ -8207,13 +8209,13 @@ calls @var{action-if-failure} (defaults to exiting with 
an error
 message).
 @end defmac
 
address@hidden AC_FC_FIXEDFORM (@ovar{action-if-success}, 
@ovar{action-if-failure})
address@hidden AC_FC_FIXEDFORM (@ovar{action-if-success}, 
@dvar{action-if-failure, @
+  AC_MSG_FAILURE})
 @acindex{FC_FIXEDFORM}
 
-The @code{AC_FC_FIXEDFORM} tries to ensure that the Fortran compiler
-(@code{$FC}) allows the old fixed-format source code (as opposed to
-free-format style).  If necessary, it may add some additional flags to
address@hidden
+Try to ensure that the Fortran compiler (@code{$FC}) allows the old
+fixed-format source code (as opposed to free-format style).  If
+necessary, it may add some additional flags to @code{FCFLAGS}.
 
 This macro is needed for some compilers alias names like @command{xlf95}
 which assume free-form source code by default, and in case you want to
@@ -8230,15 +8232,15 @@ message).
 @end defmac
 
 @defmac AC_FC_LINE_LENGTH (@ovar{length}, @ovar{action-if-success}, @
-  @ovar{action-if-failure})
+  @dvar{action-if-failure, AC_MSG_FAILURE})
 @acindex{FC_LINE_LENGTH}
 
-The @code{AC_FC_LINE_LENGTH} macro tries to ensure that the Fortran compiler
-(@code{$FC}) accepts long source code lines.  The @var{length} argument
-may be given as 80, 132, or unlimited, and defaults to 132.  Note that
-line lengths above 254 columns are not portable, and some compilers
-do not accept more than 132 columns at least for fixed format source.
-If necessary, it may add some additional flags to @code{FCFLAGS}.
+Try to ensure that the Fortran compiler (@code{$FC}) accepts long source
+code lines.  The @var{length} argument may be given as 80, 132, or
+unlimited, and defaults to 132.  Note that line lengths above 254
+columns are not portable, and some compilers do not accept more than 132
+columns at least for fixed format source.  If necessary, it may add some
+additional flags to @code{FCFLAGS}.
 
 If @code{AC_FC_LINE_LENGTH} succeeds in compiling fixed-form source, it
 calls @var{action-if-success} (defaults to nothing).  If it fails, it
@@ -23283,7 +23285,7 @@ AC_LINK_IFELSE([AC_LANG_CALL([], address@hidden)],
 @end defmac
 
 @defmac AC_TRY_RUN (@var{program}, @ovar{action-if-true}, @
-  @ovar{action-if-false}, @ovar{action-if-cross-compiling})
+  @ovar{action-if-false}, @dvar{action-if-cross-compiling, AC_MSG_FAILURE})
 @acindex{TRY_RUN}
 Same as:
 
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 89e6b49..e4b807b 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -2001,12 +2001,14 @@ AC_DEFUN([AC_OPENMP],
          dnl   IBM C (AIX, Linux)   -qsmp=omp
           dnl   Cray CCE             -homp
           dnl   NEC SX               -Popenmp
+          dnl   Lahey Fortran (Linux)  --openmp
          dnl If in this loop a compiler is passed an option that it doesn't
          dnl understand or that it misinterprets, the AC_LINK_IFELSE test
          dnl will fail (since we know that it failed without the option),
          dnl therefore the loop will continue searching for an option, and
          dnl no output file called 'penmp' or 'mp' is created.
-         for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp 
-Popenmp; do
+         for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \
+                           -Popenmp --openmp; do
            ac_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
            _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $ac_option"
            AC_LINK_IFELSE([_AC_LANG_OPENMP],
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index d5afbb9..30544c4 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -316,7 +316,8 @@ AC_DEFUN([_AC_FC_DIALECT_YEAR],
 #  fort: Compaq (now HP) Fortran 90/95 compiler for Tru64 and Linux/Alpha
 #  ifort, previously ifc: Intel Fortran 95 compiler for Linux/x86
 #  efc: Intel Fortran 95 compiler for IA64
-m4_define([_AC_F95_FC], [gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran 
pgf95 lf95 ftn])
+#  nagfor: NAGWare Fortran 77/90/95 compiler
+m4_define([_AC_F95_FC], [gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran 
pgf95 lf95 ftn nagfor])
 m4_define([_AC_F90_FC], [xlf90 f90 pgf90 pghpf epcf90])
 m4_define([_AC_F77_FC], [g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77])
 AC_DEFUN([_AC_PROG_FC],
@@ -564,7 +565,7 @@ esac
 # Determine the flag that causes the Fortran compiler to print
 # information of library and object files (normally -v)
 # Needed for _AC_FC_LIBRARY_FLAGS
-# Some compilers don't accept -v (Lahey: -verbose, xlf: -V, Fujitsu: -###)
+# Some compilers don't accept -v (Lahey: (-)-verbose, xlf: -V, Fujitsu: -###)
 AC_DEFUN([_AC_PROG_FC_V],
 [_AC_FORTRAN_ASSERT()dnl
 AC_CACHE_CHECK([how to get verbose linking output from $[]_AC_FC[]],
@@ -1179,15 +1180,17 @@ AC_LANG_POP(Fortran)dnl
 # prevent flag from being added to FCFLAGS multiple times.)
 #
 # The known flags are:
-#        -ffree-form: GNU g77, gfortran
+#        -ffree-form: GNU g77, gfortran, g95
 #         -FR, -free: Intel compiler (icc, ecc, ifort)
 #              -free: Compaq compiler (fort), Sun compiler (f95)
 #             -qfree: IBM compiler (xlf)
 # -Mfree, -Mfreeform: Portland Group compiler
 #          -freeform: SGI compiler
-#            -f free: Absoft Fortran
+#        -8, -f free: Absoft Fortran
 #       +source=free: HP Fortran
-#              -nfix: Lahey/Fujitsu Fortran
+#    (-)-nfix, -Free: Lahey/Fujitsu Fortran
+#              -free: NAGWare
+#         -f, -Wf,-f: f2c (but only a weak form of "free-form" and long lines)
 # We try to test the "more popular" flags first, by some prejudiced
 # notion of popularity.
 AC_DEFUN_ONCE([AC_FC_FREEFORM],
@@ -1197,7 +1200,7 @@ AC_CACHE_CHECK([for Fortran flag needed to accept 
free-form source],
 [ac_cv_fc_freeform=unknown
 ac_fc_freeform_FCFLAGS_save=$FCFLAGS
 for ac_flag in none -ffree-form -FR -free -qfree -Mfree -Mfreeform \
-              -freeform "-f free" +source=free -nfix
+              -freeform "-f free" -8 +source=free -nfix --nfix -Free
 do
   test "x$ac_flag" != xnone && FCFLAGS="$ac_fc_freeform_FCFLAGS_save $ac_flag"
 dnl Use @&t@ below to ensure that editors don't turn 8+ spaces into tab.
@@ -1235,14 +1238,15 @@ AC_LANG_POP([Fortran])dnl
 # prevent flag from being added to FCFLAGS multiple times.)
 #
 # The known flags are:
-#       -ffixed-form: GNU g77, gfortran
+#       -ffixed-form: GNU g77, gfortran, g95
 #             -fixed: Intel compiler (ifort), Sun compiler (f95)
 #            -qfixed: IBM compiler (xlf*)
 #            -Mfixed: Portland Group compiler
 #         -fixedform: SGI compiler
 #           -f fixed: Absoft Fortran
 #      +source=fixed: HP Fortran
-#              -fix: Lahey/Fujitsu Fortran
+#    (-)-fix, -Fixed: Lahey/Fujitsu Fortran
+#             -fixed: NAGWare
 # Since compilers may accept fixed form based on file name extension,
 # but users may want to use it with others as well, call AC_FC_SRCEXT
 # with the respective source extension before calling this macro.
@@ -1253,7 +1257,7 @@ AC_CACHE_CHECK([for Fortran flag needed to accept 
fixed-form source],
 [ac_cv_fc_fixedform=unknown
 ac_fc_fixedform_FCFLAGS_save=$FCFLAGS
 for ac_flag in none -ffixed-form -fixed -qfixed -Mfixed -fixedform "-f fixed" \
-              +source=fixed -fix
+              +source=fixed -fix --fix -Fixed
 do
   test "x$ac_flag" != xnone && FCFLAGS="$ac_fc_fixedform_FCFLAGS_save $ac_flag"
   AC_COMPILE_IFELSE([[
@@ -1296,6 +1300,7 @@ AC_LANG_POP([Fortran])dnl
 # The known flags are:
 # -f{free,fixed}-line-length-N with N 72, 80, 132, or 0 or none for none.
 # -ffree-line-length-none: GNU gfortran
+# -ffree-line-length-huge: g95 (also -ffixed-line-length-N as above)
 #       -qfixed=132 80 72: IBM compiler (xlf)
 #                -Mextend: Cray
 #            -132 -80 -72: Intel compiler (ifort)
@@ -1303,11 +1308,14 @@ AC_LANG_POP([Fortran])dnl
 #                          accepts that as well with an optional parameter and
 #                          doesn't fail but only warns about unknown arguments.
 #          -extend_source: SGI compiler
-#     -W NN (132, 80, 72): Absoft Fortran
-#          +extend_source: HP Fortran (254 in either form, default is 72 fixed,
+#  -W, -WNN (132, 80, 72): Absoft Fortran
+#     +es, +extend_source: HP Fortran (254 in either form, default is 72 fixed,
 #                         132 free)
-#                   -wide: Lahey/Fujitsu Fortran (255 cols in fixed form)
+#            -w, (-)-wide: Lahey/Fujitsu Fortran (255 cols in fixed form)
 #                      -e: Sun Fortran compiler (132 characters)
+#                    -132: NAGWare
+#         -72, -f, -Wf,-f: f2c (a weak form of "free-form" and long lines).
+#                  /XLine: Open Watcom
 AC_DEFUN_ONCE([AC_FC_LINE_LENGTH],
 [AC_LANG_PUSH([Fortran])dnl
 m4_case(m4_default([$1], [132]),
@@ -1332,11 +1340,13 @@ AC_CACHE_CHECK(
 ac_fc_line_length_FCFLAGS_save=$FCFLAGS
 for ac_flag in none \
               -ffree-line-length-none -ffixed-line-length-none \
+              -ffree-line-length-huge \
               -ffree-line-length-$ac_fc_line_len \
               -ffixed-line-length-$ac_fc_line_len \
               -qfixed=$ac_fc_line_len -Mextend \
               -$ac_fc_line_len -extend_source \
-              "-W $ac_fc_line_len" +extend_source -wide -e
+              -W$ac_fc_line_len -W +extend_source +es -wide --wide -w -e \
+               -f -Wf,-f -xline
 do
   test "x$ac_flag" != xnone && FCFLAGS="$ac_fc_line_length_FCFLAGS_save 
$ac_flag"
   AC_COMPILE_IFELSE([[$ac_fc_line_length_test
diff --git a/tests/fortran.at b/tests/fortran.at
index f0fec7c..87403a7 100644
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -32,17 +32,19 @@ AT_CHECK_MACRO([GNU Fortran 77],
 [[AC_LANG(Fortran 77)
 AC_LANG_COMPILER
 
-if AC_TRY_COMMAND([$F77 --version | grep GNU >&2]); then
+: > conftest.f
+if AC_TRY_COMMAND([$F77 --version | grep GNU >&2]) \
+   || AC_TRY_COMMAND([$F77 -v -c conftest.f 2>&1 | grep "f2c " >&2]); then
   # Be sure to remove files which might be created by compilers that
-  # don't support --version.
-  rm -f a.exe a.out
+  # don't support --version, or by the second compile.
+  rm -f a.exe a.out conftest.f conftest.$ac_objext
   # Has GNU in --version.
   test "$G77" != yes &&
     AC_MSG_ERROR([failed to recognize GNU Fortran 77 compiler])
 else
   # Be sure to remove files which might be created by compilers that
-  # don't support --version.
-  rm -f a.exe a.out
+  # don't support --version, or by the second compile.
+  rm -f a.exe a.out conftest.f conftest.$ac_objext
   # Has not.
   test "$G77" = yes &&
     AC_MSG_ERROR([incorrectly recognized a GNU Fortran 77 compiler])


hooks/post-receive
-- 
GNU Autoconf source repository