96-ac-path-xtra.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in ($seen_path_xtra): Remove.
        (&handle_compile): Don't handle `AC_PATH_XTRA' AC_SUBST variables.
        (&scan_one_autoconf_file): Do it, instead of setting $seen_path_xtra.
        
        
Index: automake.in
--- automake.in Wed, 28 Mar 2001 22:10:05 +0200 akim (am/f/39_automake.i 1.222 
755)
+++ automake.in Wed, 28 Mar 2001 22:19:13 +0200 akim (am/f/39_automake.i 1.222 
755)
@@ -334,9 +334,6 @@ sub finish ($)
 # 1 if AC_PROG_INSTALL seen.
 my $seen_prog_install = 0;
 
-# Whether AC_PATH_XTRA has been seen in configure.ac.
-my $seen_path_xtra = 0;
-
 # TRUE if AC_DECL_YYTEXT was seen.
 my $seen_decl_yytext = 0;
 
@@ -2019,18 +2016,6 @@ sub handle_compile ()
     $output_vars .= $vars;
     $output_rules .= "$coms$rules";
 
-    # If using X, include some extra variable definitions.  NOTE
-    # we don't want to force these into CFLAGS or anything,
-    # because not all programs will necessarily use X.
-    if ($seen_path_xtra)
-      {
-       foreach my $var ('X_CFLAGS',
-                        'X_LIBS', 'X_EXTRA_LIBS', 'X_PRE_LIBS')
-         {
-           &define_configure_variable ($var);
-         }
-      }
-
     if ($seen_libtool)
       {
        # Output the libtool compilation rules.
@@ -4418,7 +4403,17 @@ sub scan_one_autoconf_file
                && (/AC_CANONICAL_HOST/ || /AC_CHECK_TOOL/);
         $seen_canonical = $AC_CANONICAL_SYSTEM if /AC_CANONICAL_SYSTEM/;
 
-       $seen_path_xtra = 1 if /AC_PATH_XTRA/;
+        # If using X, include some extra variable definitions.  NOTE
+        # we don't want to force these into CFLAGS or anything,
+        # because not all programs will necessarily use X.
+       if (/AC_PATH_XTRA/)
+         {
+           foreach my $var ('X_CFLAGS', 'X_LIBS', 'X_EXTRA_LIBS',
+                            'X_PRE_LIBS')
+             {
+               $configure_vars{$var} = $filename . ':' . $.
+             }
+         }
 
         # This macro handles several different things.
         if (/$AM_INIT_AUTOMAKE_PATTERN/o)