From b0642c74104615647f21d229e97f8025ae3e3094 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 27 Apr 2001 13:57:38 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ automake.in | 27 +++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 364c958c..8514e749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-04-27 Akim Demaille + + * 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. + + 2001-04-27 Akim Demaille * automake.in (&file_contents_internal): Declare it. diff --git a/automake.in b/automake.in index 971e4638..fab79532 100755 --- a/automake.in +++ b/automake.in @@ -342,9 +342,6 @@ my $all_linguas_line = 0; # 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; @@ -2033,18 +2030,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. @@ -4508,7 +4493,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) -- 2.43.5