[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
97-am-init-automake.patch
From: |
Akim Demaille |
Subject: |
97-am-init-automake.patch |
Date: |
Sun, 01 Apr 2001 21:56:19 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
AM_INIT_AUTOMAKE is no longer optional.
* automake.in ($seen_make_set, $seen_prog_install)
($seen_arg_prog): Remove.
(&handle_programs, &handle_scripts, &scan_one_autoconf_file):
Remove related code.
Index: automake.in
--- automake.in Wed, 28 Mar 2001 22:19:57 +0200 akim (am/f/39_automake.i 1.223
755)
+++ automake.in Wed, 28 Mar 2001 22:24:38 +0200 akim (am/f/39_automake.i 1.223
755)
@@ -316,9 +316,6 @@ sub finish ($)
my @config_aux_path = ('.', '..', '../..');
my $config_aux_dir = '';
-# Whether AC_PROG_MAKE_SET has been seen in configure.ac.
-my $seen_make_set = 0;
-
# Whether AM_GNU_GETTEXT has been seen in configure.ac.
my $seen_gettext = 0;
# Line number at which AM_GNU_GETTEXT seen.
@@ -331,9 +328,6 @@ sub finish ($)
# Line number at which it appears.
my $all_linguas_line = 0;
-# 1 if AC_PROG_INSTALL seen.
-my $seen_prog_install = 0;
-
# TRUE if AC_DECL_YYTEXT was seen.
my $seen_decl_yytext = 0;
@@ -341,9 +335,6 @@ sub finish ($)
# AC_CHECK_TOOL also sets this.
my $seen_canonical = 0;
-# TRUE if we've seen AC_ARG_PROGRAM.
-my $seen_arg_prog = 0;
-
# TRUE if we've seen AC_PROG_LIBTOOL.
my $seen_libtool = 0;
my $libtool_line = 0;
@@ -2068,12 +2059,6 @@ sub handle_programs
'noinst', 'check');
return if ! @proglist;
- # If a program is installed, this is required. We only want this
- # error to appear once.
- &am_conf_error ("AC_ARG_PROGRAM must be used")
- unless $seen_arg_prog;
- $seen_arg_prog = 1;
-
my $seen_libobjs = 0;
foreach my $one_file (@proglist)
{
@@ -2467,15 +2452,6 @@ sub handle_scripts
# push (@check_tests, 'check-' . $key . 'SCRIPTS');
}
}
-
- if ($scripts_installed)
- {
- # If a program is installed, this is required. We only want this
- # error to appear once.
- &am_conf_error ("AC_ARG_PROGRAM must be used")
- unless $seen_arg_prog;
- $seen_arg_prog = 1;
- }
}
@@ -3114,11 +3114,6 @@ sub add_depend2
}
}
-# Handle auto-dependency code.
-sub handle_dependencies
-{
-}
-
# Handle subdirectories.
sub handle_subdirs
{
@@ -4418,18 +4394,11 @@ sub scan_one_autoconf_file
# This macro handles several different things.
if (/$AM_INIT_AUTOMAKE_PATTERN/o)
{
- $seen_make_set = 1;
- $seen_arg_prog = 1;
- $seen_prog_install = 1;
($package_version = $1) =~ s/$AM_PACKAGE_VERSION_PATTERN/$1/o;
$package_version_line = $.;
$seen_init_automake = 1;
}
- # Some things required by Automake.
- $seen_make_set = 1 if /AC_PROG_MAKE_SET/;
- $seen_arg_prog = 1 if /AC_ARG_PROGRAM/;
-
if (/AM_PROG_LEX/)
{
$configure_vars{'LEX'} = $filename . ':' . $.;
@@ -4481,7 +4450,6 @@ sub scan_one_autoconf_file
$configure_cond{'MAINTAINER_MODE'} = 1;
}
- $seen_prog_install = 1 if /AC_PROG_INSTALL/;
$seen_lispdir = 1 if /AM_PATH_LISPDIR/;
if (/AM_PATH_PYTHON/)
@@ -4576,14 +4544,6 @@ sub scan_autoconf_files
&am_conf_error ("`AM_INIT_AUTOMAKE' must be used")
if ! $seen_init_automake;
-
- # Always require AC_PROG_MAKE_SET. We might randomly use $(MAKE)
- # for our own reasons.
- &am_conf_error ("`AC_PROG_MAKE_SET' must be used")
- if ! $seen_make_set;
-
- &am_conf_error ("`AC_PROG_INSTALL' must be used")
- if ! $seen_prog_install;
# Look for some files we need. Always check for these. This
# check must be done for every run, even those where we are only
- 97-am-init-automake.patch,
Akim Demaille <=