From eca8ba4c6ed47ea9e42c25335818035fc3150d1d Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Fri, 27 Apr 2001 13:30:31 +0000
Subject: [PATCH] * automake.in (handle_compile): Let ansi2knr.am define
 $(ANSI2KNR). * ansi2knr.am: Do it. Prefer `if %?FOO%' to `if %!FOO%'.

---
 ChangeLog          |  6 ++++++
 ansi2knr.am        | 21 ++++++++++++++-------
 automake.in        | 18 +++---------------
 lib/am/ansi2knr.am | 21 ++++++++++++++-------
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20ad7ae8..b0042af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-27  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (handle_compile): Let ansi2knr.am define $(ANSI2KNR).
+	* ansi2knr.am: Do it.
+	Prefer `if %?FOO%' to `if %!FOO%'.
+
 2001-04-27  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&register_language, &finish_languages): Use `pure'
diff --git a/ansi2knr.am b/ansi2knr.am
index 3550e14f..0e4c921a 100644
--- a/ansi2knr.am
+++ b/ansi2knr.am
@@ -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%
 
 
 ## ------------------- ##
diff --git a/automake.in b/automake.in
index b56fbfc9..e54a71b0 100755
--- a/automake.in
+++ b/automake.in
@@ -2062,29 +2062,17 @@ 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 = '';
 	$ansi2knr_dir = dirname ($options{'ansi2knr'})
diff --git a/lib/am/ansi2knr.am b/lib/am/ansi2knr.am
index 3550e14f..0e4c921a 100644
--- a/lib/am/ansi2knr.am
+++ b/lib/am/ansi2knr.am
@@ -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%
 
 
 ## ------------------- ##
-- 
2.43.5