* automake.in (handle_single_transform_list): Don't call

$lang->target_hook for undefinied langages.
* tests/suffix4.test: New test.
* tests/Makefile.am (TESTS): Add suffix4.test.
Reported by Dmitry Mikhin <dmitrym@acres.com.au>.

diff --git a/ChangeLog b/ChangeLog
index 5bf05658533a71e180406149957d2b2091a1fe11..5afc7966b2eacd3746c836c09950fded27c49df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-01  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (handle_single_transform_list): Don't call
+       $lang->target_hook for undefinied langages.
+       * tests/suffix4.test: New test.
+       * tests/Makefile.am (TESTS): Add suffix4.test.
+       Reported by Dmitry Mikhin <dmitrym@acres.com.au>.
+
 2001-11-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (@common_sometimes, &handle_configure): No longer
@@ -20,7 +28,7 @@
 2001-10-31  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * m4/gcj.m4 (AM_PROG_GCJ): Define GCJFLAGS if unset.
-       Reported by Olivier Louchart-Fletcher <olivier@zipworld.com>.
+       Reported by Olivier Louchart-Fletcher <olivier@zipworld.com.au>.
 
 2001-10-30  Akim Demaille  <akim@epita.fr>
 

diff --git a/THANKS b/THANKS
index f2ecb56d19fa3980d3616a847075baaf22190e73..3198aeec5c2df7fd8f9a95604dc53000cd886b85 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,7 @@ David A. Swierczek    swiercze@mr.med.ge.com
 David Zaroski          cz253@cleveland.Freenet.Edu
 Derek R. Price         derek.price@openavenue.com
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
+Dmitry Mikhin          dmitrym@acres.com.au
 Doug Evans             devans@cygnus.com
 Eleftherios Gkioulekas lf@amath.washington.edu
 Elrond                 Elrond@Wunder-Nett.org

diff --git a/automake.in b/automake.in
index d45a8d2dfd060f78402ed71467f5688f9ee60964..b436e63964d0d512831528e70262dfbe16417a8e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1892,8 +1892,10 @@ sub handle_single_transform_list ($$$$@)
             }
         }
 
-       # Let the language do some special magic if required.
-       $lang->target_hook ($aggregate, $object, $full);
+       if (defined $lang) {
+           # Let the language do some special magic if required.
+           $lang->target_hook ($aggregate, $object, $full);
+       }
 
        if ($derived_source)
        {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d452e94c3089b9be110fbb128ec8a77e805b2101..c195075faf955333f1b5b62d56c52ba35d7212a5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -288,6 +288,7 @@ substtarg.test \
 suffix.test \
 suffix2.test \
 suffix3.test \
+suffix4.test \
 symlink.test \
 symlink2.test \
 symlink3.test \

diff --git a/tests/suffix4.test b/tests/suffix4.test
new file mode 100755 (executable)
index 0000000..3bac120
--- /dev/null
+++ b/tests/suffix4.test
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# Test to make sure Automake doesn't abort on user-defined extensions.
+# Based on a report from Dmitry Mikhin <dmitrym@acres.com.au>.
+
+# Also make sure that .SUFFIXES is automatically adjusted with
+# extensions from implicit rules.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+.k.o:
+       echo $< > $@
+
+bin_PROGRAMS = foo
+foo_SOURCES = foo.k
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE --Wno-error || exit 1
+grep '.SUFFIXES:.*\.k' Makefile.in || exit 1
+exit 0