automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: AM_DEFAULT_SOURCE_EXT


From: Ralf Wildenhues
Subject: Re: AM_DEFAULT_SOURCE_EXT
Date: Mon, 3 Nov 2008 22:50:45 +0100
User-agent: Mutt/1.5.18 (2008-05-17)

* Ralf Wildenhues wrote on Sun, Nov 02, 2008 at 10:58:08PM CET:
>     Choose default source extension: AM_DEFAULT_SOURCE_EXT.
>     
>     * automake.in (handle_source_transform): Accept unconditional
>     literal extension in AM_DEFAULT_SOURCE_EXT as override for the
>     default source extension `.c'.  If set, ignore the old default
>     source rule for libtool libraries.
>     * doc/automake.texi (Default _SOURCES): Document this.
>     * NEWS: Update.
>     * tests/specflg10.test: New test.
>     * tests/Makefile.am: Update.
>     Suggestion by Akim Demaille.

This caused a small regression, because I didn't rename variables
consistently.  Fixed thusly.

Cheers,
Ralf

    Fix regression introduced by AM_DEFAULT_SOURCE_EXT.
    
    * automake.in (handle_source_transform): Use the right variable
    when determining whether to apply the old rule for the libtool
    library default source name.
    Testsuite failure exposed by Bob Proulx' build daemon.

diff --git a/automake.in b/automake.in
index 9665e0b..9f50c8c 100755
--- a/automake.in
+++ b/automake.in
@@ -2085,7 +2085,7 @@ sub handle_source_transform ($$$$%)
          if $default_source_ext =~ /[\t ]/;
        (my $default_source = $unxformed) =~ 
s,(\.[^./\\]*)?$,$default_source_ext,;
        if ($old_default_source ne $default_source
-           && !$default_source_ext
+           && !$ext_var
            && (rule $old_default_source
                || rule '$(srcdir)/' . $old_default_source
                || rule '${srcdir}/' . $old_default_source




reply via email to

[Prev in Thread] Current Thread [Next in Thread]