* automake.in: Fortran 77 and Fortran should require variables

F77 resp. FC to be defined, and suggest the respective Autoconf
macros otherwise.
* tests/fort1.test: New test.
* tests/Makefile.am: Update.

diff --git a/ChangeLog b/ChangeLog
index df6b3401e745c14d27905acba93d07740755864d..de7d28933b25f1709c4ff8b07f348ff7e313c173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-08-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * automake.in: Fortran 77 and Fortran should require variables
+       F77 resp. FC to be defined, and suggest the respective Autoconf
+       macros otherwise.
+       * tests/fort1.test: New test.
+       * tests/Makefile.am: Update.
+
        * tests/ext.test: Add extensions f95, F90, F95.
 
 2006-08-30  Alexandre Duret-Lutz  <adl@gnu.org>

diff --git a/automake.in b/automake.in
index b08c591a62d9eba2410fcc68b164e89d21add501..ecb87e09e130a29696d93f8e8926836c66fcfe95 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -864,6 +864,7 @@ register_language ('name' => 'cppasm',
 # Fortran 77
 register_language ('name' => 'f77',
                   'Name' => 'Fortran 77',
+                  'config_vars' => ['F77'],
                   'linker' => 'F77LINK',
                   'link' => '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
                   'flags' => ['FFLAGS'],
@@ -880,6 +881,7 @@ register_language ('name' => 'f77',
 # Fortran
 register_language ('name' => 'fc',
                   'Name' => 'Fortran',
+                  'config_vars' => ['FC'],
                   'linker' => 'FCLINK',
                   'link' => '$(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
                   'flags' => ['FCFLAGS'],

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61f999a91ed656f868f813c8a65cce49ad6052b2..addff01bcade77bbc727e54be34e7d39a14d98cf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -244,6 +244,7 @@ flibs.test \
 fn99.test \
 fnoc.test \
 fo.test        \
+fort1.test \
 fonly.test \
 fortdep.test \
 fpinst2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3934eacd771a81d8240295bf2f525ad9d509f8b2..310c50542dd21de04736f7b9041ab8b43cceac82 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -376,6 +376,7 @@ flibs.test \
 fn99.test \
 fnoc.test \
 fo.test        \
+fort1.test \
 fonly.test \
 fortdep.test \
 fpinst2.test \

diff --git a/tests/fort1.test b/tests/fort1.test
new file mode 100755 (executable)
index 0000000..8696513
--- /dev/null
+++ b/tests/fort1.test
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Test that Automake suggests using AC_PROG_F77/FC if Fortran sources
+# are used.
+
+. ./defs || exit 1
+
+set -e
+
+cat >Makefile.am <<END
+bin_PROGRAMS = hello
+hello_SOURCES = hello.f foo.f95
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep AC_PROG_F77 stderr
+grep AC_PROG_FC stderr