94-ansi2knr.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * automake.in (handle_compile): Let ansi2knr.am define $(ANSI2KNR).
        * ansi2knr.am: Do it.
        Prefer `if %?FOO% to `if %!FOO%.
        
Index: ansi2knr.am
--- ansi2knr.am Sun, 11 Mar 2001 21:33:37 +0100 akim (am/h/37_ansi2knr.a 1.1 
644)
+++ ansi2knr.am Wed, 28 Mar 2001 22:05:05 +0200 akim (am/h/37_ansi2knr.a 1.1 
644)
@@ -16,23 +16,30 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+## %ANSI2KNR-DIR% is the directory where ansi2knr is, `' if
+## is the current directory.
+
 
 ## ---------- ##
 ## ansi2knr.  ##
 ## ---------- ##
 
-if %!ANSI2KNR-DIR%
+if %?ANSI2KNR-DIR%
+
+ANSI2KNR = %ANSI2KNR-DIR%/ansi2knr
+%ANSI2KNR-DIR%/ansi2knr:
+       cd %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
+
+else %?ANSI2KNR-DIR%
 
+## Substitution from AM_C_PROTOTYPES.  This makes it be built only when
+## necessary.
+ANSI2KNR = @ANSI2KNR@
 ansi2knr: ansi2knr.$(OBJEXT)
        $(LINK) ansi2knr.$(OBJEXT) $(LIBS)
 ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
 
-else %!ANSI2KNR-DIR%
-
-%ANSI2KNR-DIR%/ansi2knr:
-       cd %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-endif %!ANSI2KNR-DIR%
+endif %?ANSI2KNR-DIR%
 
 
 ## ------------------- ##
Index: automake.in
--- automake.in Wed, 28 Mar 2001 21:45:00 +0200 akim (am/f/39_automake.i 1.220 
755)
+++ automake.in Wed, 28 Mar 2001 22:03:06 +0200 akim (am/f/39_automake.i 1.220 
755)
@@ -2049,28 +2049,16 @@ sub handle_compile ()
            $am_c_prototypes = 1;
          }
 
-       # Only require ansi2knr files if they should appear in
-       # this directory.
+       # topdir is where ansi2knr should be.
        if ($options{'ansi2knr'} eq 'ansi2knr')
          {
+           # Only require ansi2knr files if they should appear in
+           # this directory.
            &require_file_with_line ('AUTOMAKE_OPTIONS', $FOREIGN,
                                     'ansi2knr.c', 'ansi2knr.1');
-         }
 
-       # Make sure ansi2knr can be found: if no path specified,
-       # specify "./".
-       if ($options{'ansi2knr'} eq 'ansi2knr')
-         {
-           # Substitution from AM_C_PROTOTYPES.  This makes it be
-           # built only when necessary.
-           &define_configure_variable ('ANSI2KNR');
            # ansi2knr needs to be built before subdirs, so unshift it.
            unshift (@all, '$(ANSI2KNR)');
-         }
-       else
-         {
-           # Found in another directory.
-           &define_variable ("ANSI2KNR", $options{'ansi2knr'});
          }
 
        my $ansi2knr_dir = '';