From: Tom Tromey <tromey@redhat.com>
Date: Sun, 17 Jun 2001 19:02:40 +0000 (+0000)
Subject: 	Fix for libtool.test:
X-Git-Tag: Release-1-4h~22
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2810d0cb5378b08b30d0bed9b96150c20b158ccc;p=automake.git

	Fix for libtool.test:
	* automake.in (generate_makefile): Call handle_libtool.
	(handle_libtool): New sub.
	(handle_compile): Don't read `libtool' file.
---

diff --git a/ChangeLog b/ChangeLog
index b2d36fa4..ca600e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-17  Tom Tromey  <tromey@redhat.com>
 
+	Fix for libtool.test:
+	* automake.in (generate_makefile): Call handle_libtool.
+	(handle_libtool): New sub.
+	(handle_compile): Don't read `libtool' file.
+
 	* tests/acoutput2.test: New file.
 	* tests/Makefile.am (TESTS): Added acoutput2.test.
 
diff --git a/automake.in b/automake.in
index 83ac74af..4fe79c9d 100755
--- a/automake.in
+++ b/automake.in
@@ -1174,10 +1174,7 @@ sub generate_makefile
     # or libtool scripts (ltconfig and ltmain.sh).
     if ($relative_dir eq '.')
     {
- 	# libtool requires some files.
- 	&require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
- 					   @libtoolize_files)
-	    if $seen_libtool;
+	&handle_libtool;
 
         # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and
         # config.sub.
@@ -2276,12 +2273,6 @@ sub handle_compile ()
     $output_vars .= $vars;
     $output_rules .= "$coms$rules";
 
-    if ($seen_libtool)
-      {
-	# Output the libtool compilation rules.
-	$output_rules .= &file_contents ('libtool');
-      }
-
     # Check for automatic de-ANSI-fication.
     if (defined $options{'ansi2knr'})
       {
@@ -2316,7 +2307,19 @@ sub handle_compile ()
     }
 }
 
+# handle_libtool ()
+# -----------------
+# Handle libtool rules.  Only called when RELATIVE_DIR is `.'.
+sub handle_libtool
+{
+    return unless $seen_libtool;
 
+    # libtool requires some files.
+    &require_conf_file_with_conf_line ($libtool_line, $FOREIGN,
+				       @libtoolize_files);
+    # Output the libtool compilation rules.
+    $output_rules .= &file_contents ('libtool');
+}
 
 # handle_programs ()
 # ------------------