From: Alexandre Duret-Lutz Date: Sat, 13 Apr 2002 21:26:33 +0000 (+0000) Subject: Enable traces; wipe out the old configure.in parser. X-Git-Tag: Release-1-6b~128 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8dd8fec7de73bfda24a952d015285d4ef7afa524;p=automake.git Enable traces; wipe out the old configure.in parser. * automake.in (scan_autoconf_traces): Use '$ENF{AUTOCONF}' of 'autoconf'. Honnor the $filename argument. (scan_autoconf_files): Don't call scan_one_autoconf_file. Always call scan_autoconf_traces. (scan_one_autoconf_file): Remove, with it associated regexes. (obsolete, obsolete_rx): Remove. (register_language, handle_languages): Remove the 'define_flag' support. Remove it from the struct and language definitions too. (unquote_m4_arg): Remove. * lib/am/header-vars.am, lib/am/compile.am, lib/am/lisp.am: Remove the `FOO = @FOO@' definitions for all AC_SUBST'ed variables. They are now generated automatically. * aclocal.in (obsolete_macros): Don't mention obsolete_macros in automake.in. * automake.texi (Invoking Automake): Mention the AUTOCONF envvar. --- diff --git a/ChangeLog b/ChangeLog index 12c3c16e..1ca8e2ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2002-04-13 Alexandre Duret-Lutz + + Enable traces; wipe out the old configure.in parser. + + * automake.in (scan_autoconf_traces): Use '$ENF{AUTOCONF}' of + 'autoconf'. Honnor the $filename argument. + (scan_autoconf_files): Don't call scan_one_autoconf_file. + Always call scan_autoconf_traces. + (scan_one_autoconf_file): Remove, with it associated regexes. + (obsolete, obsolete_rx): Remove. + (register_language, handle_languages): Remove the 'define_flag' + support. Remove it from the struct and language definitions too. + (unquote_m4_arg): Remove. + * lib/am/header-vars.am, lib/am/compile.am, lib/am/lisp.am: Remove + the `FOO = @FOO@' definitions for all AC_SUBST'ed variables. They + are now generated automatically. + * aclocal.in (obsolete_macros): Don't mention obsolete_macros in + automake.in. + * automake.texi (Invoking Automake): Mention the AUTOCONF envvar. + 2002-04-13 Alexandre Duret-Lutz * tests/version6.test: New file. diff --git a/Makefile.in b/Makefile.in index 1aad5d37..56b8f01c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = . m4 lib tests diff --git a/NEWS b/NEWS index 63a5821c..550149e1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ New in 1.6a: +* Use Autoconf's --trace interface to inspect configure.ac and get + a more accurate view of it. * automake --output-dir is deprecated * Many bug fixes. diff --git a/aclocal.in b/aclocal.in index 326b6afe..89e7c5a6 100644 --- a/aclocal.in +++ b/aclocal.in @@ -77,8 +77,6 @@ $output_file = 'aclocal.m4'; $verbose = 0; # Map from obsolete macros to hints for new macros. -# If you change this, change the corresponding list in automake.in. -# FIXME: should just put this into a single file. my %obsolete_macros = ( 'AC_FEATURE_CTYPE' => "use `AC_HEADER_STDC'", @@ -87,8 +85,7 @@ my %obsolete_macros = 'AC_SYSTEM_HEADER' => '', # Note that we do not handle this one, because it is still run - # from AM_CONFIG_HEADER. So we deal with it specially in - # &scan_autoconf_files. + # from AM_CONFIG_HEADER. # 'AC_CONFIG_HEADER' => "use `AM_CONFIG_HEADER'", 'fp_C_PROTOTYPES' => "use `AM_C_PROTOTYPES'", diff --git a/automake.in b/automake.in index 322cb886..dccbbcd2 100755 --- a/automake.in +++ b/automake.in @@ -61,10 +61,6 @@ struct (# Short name of the language (c, f77...). 'compile_flag' => "\$", 'extensions' => '@', 'flags' => "\$", - # Should the flag be defined as a configure variable. - # Defaults to true. FIXME: this should go away once - # we move to autoconf tracing. - 'define_flag' => "\$", # The file to use when generating rules for this language. # The default is 'depend2'. @@ -127,7 +123,9 @@ my $PACKAGE = "@PACKAGE@"; my $prefix = "@prefix@"; my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@"; -# String constants. +# Some regular expressions. One reason to put them here is that it +# makes indentation work better in Emacs. + my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n'; my $WHITE_PATTERN = '^\s*$'; my $COMMENT_PATTERN = '^#'; @@ -157,23 +155,9 @@ my $INCLUDE_PATTERN = ('^include\s+' . '|(\$\(srcdir\)/' . $PATH_PATTERN . ')' . '|([^/\$]' . $PATH_PATTERN. '))\s*(#.*)?$'); -# Some regular expressions. One reason to put them here is that it -# makes indentation work better in Emacs. -my $AC_CONFIG_AUX_DIR_PATTERN = 'AC_CONFIG_AUX_DIR\(([^)]+)\)'; -my $AM_INIT_AUTOMAKE_PATTERN = 'AM_INIT_AUTOMAKE\([^,]*,([^,)]+)[,)]'; -my $AC_INIT_PATTERN = 'AC_INIT\([^,]*,([^,)]+)[,)]'; -my $AM_PACKAGE_VERSION_PATTERN = '^\s*\[?([^]\s]+)\]?\s*$'; - # This handles substitution references like ${foo:.a=.b}. my $SUBST_REF_PATTERN = "^([^:]*):([^=]*)=(.*)\$"; -# Note that there is no AC_PATH_TOOL. But we don't really care. -my $AC_CHECK_PATTERN = 'AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\(\[?(\w+)'; -my $AM_MISSING_PATTERN = 'AM_MISSING_PROG\(\[?(\w+)'; -# Just check for alphanumeric in AC_SUBST. If you do AC_SUBST(5), -# then too bad. -my $AC_SUBST_PATTERN = 'AC_SUBST\(\[?(\w+)'; -my $AM_CONDITIONAL_PATTERN = 'AM_CONDITIONAL\(\[?(\w+)'; # Match `-d' as a command-line argument in a string. my $DASH_D_PATTERN = "(^|\\s)-d(\\s|\$)"; # Directories installed during 'install-exec' phase. @@ -250,45 +234,6 @@ my $LANG_SUBDIR = 2; # by two different paths. my $COMPILE_LIBTOOL = 1; my $COMPILE_ORDINARY = 2; - -# Map from obsolete macros to hints for new macros. -# If you change this, change the corresponding list in aclocal.in. -# FIXME: should just put this into a single file. -my %obsolete_macros = - ( - 'AC_FEATURE_CTYPE' => "use `AC_HEADER_STDC'", - 'AC_FEATURE_ERRNO' => "add `strerror' to `AC_REPLACE_FUNCS(...)'", - 'AC_FEATURE_EXIT' => '', - 'AC_SYSTEM_HEADER' => '', - - # Note that we do not handle this one, because it is still run - # from AM_CONFIG_HEADER. So we deal with it specially in - # &scan_autoconf_files. - # 'AC_CONFIG_HEADER' => "use `AM_CONFIG_HEADER'", - - 'fp_C_PROTOTYPES' => "use `AM_C_PROTOTYPES'", - 'fp_PROG_CC_STDC' => "use `AM_PROG_CC_STDC'", - 'fp_PROG_INSTALL' => "use `AC_PROG_INSTALL'", - 'fp_WITH_DMALLOC' => "use `AM_WITH_DMALLOC'", - 'fp_WITH_REGEX' => "use `AM_WITH_REGEX'", - 'gm_PROG_LIBTOOL' => "use `AM_PROG_LIBTOOL'", - 'jm_MAINTAINER_MODE' => "use `AM_MAINTAINER_MODE'", - 'md_TYPE_PTRDIFF_T' => "add `ptrdiff_t' to `AC_CHECK_TYPES(...)'", - 'ud_PATH_LISPDIR' => "use `AM_PATH_LISPDIR'", - 'ud_GNU_GETTEXT' => "use `AM_GNU_GETTEXT'", - - # Now part of autoconf proper, under a different name. - 'fp_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'", - 'AM_SANITY_CHECK_CC' => "automatically done by `AC_PROG_CC'", - 'AM_PROG_INSTALL' => "use `AC_PROG_INSTALL'", - 'AM_EXEEXT' => "automatically done by `AC_PROG_(CC|CXX|F77)'", - 'AM_CYGWIN32' => "use `AC_CYGWIN'", - 'AM_MINGW32' => "use `AC_MINGW32'", - 'AM_FUNC_MKTIME' => "use `AC_FUNC_MKTIME'", - ); - -# Regexp to match the above macros. -my $obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b'; @@ -864,7 +809,6 @@ register_language ('name' => 'yacc', 'Name' => 'Yacc', 'config_vars' => ['YACC'], 'flags' => 'YFLAGS', - 'define_flag' => 0, 'compile' => '$(YACC) $(YFLAGS) $(AM_YFLAGS)', 'compiler' => 'YACCCOMPILE', 'extensions' => ['.y'], @@ -876,7 +820,6 @@ register_language ('name' => 'yaccxx', 'config_vars' => ['YACC'], 'rule_file' => 'yacc', 'flags' => 'YFLAGS', - 'define_flag' => 0, 'compiler' => 'YACCCOMPILE', 'compile' => '$(YACC) $(YFLAGS) $(AM_YFLAGS)', 'extensions' => ['.y++', '.yy', '.yxx', '.ypp'], @@ -889,7 +832,6 @@ register_language ('name' => 'lex', 'config_vars' => ['LEX'], 'rule_file' => 'lex', 'flags' => 'LFLAGS', - 'define_flag' => 0, 'compile' => '$(LEX) $(LFLAGS) $(AM_LFLAGS)', 'compiler' => 'LEXCOMPILE', 'extensions' => ['.l'], @@ -899,7 +841,6 @@ register_language ('name' => 'lexxx', 'config_vars' => ['LEX'], 'rule_file' => 'lex', 'flags' => 'LFLAGS', - 'define_flag' => 0, 'compile' => '$(LEX) $(LFLAGS) $(AM_LFLAGS)', 'compiler' => 'LEXCOMPILE', 'extensions' => ['.l++', '.ll', '.lxx', '.lpp'], @@ -1812,10 +1753,6 @@ sub handle_languages if !exists $configure_vars{$var}; } - # The compiler's flag must be a configure variable. - define_configure_variable ($lang->flags) - if defined $lang->flags && $lang->define_flag; - # Call the finisher. $lang->finish; } @@ -4611,7 +4548,6 @@ sub scan_autoconf_config_files # &scan_autoconf_traces ($FILENAME) # --------------------------------- -# FIXME: For the time being, we don't care about the FILENAME. sub scan_autoconf_traces ($) { my ($filename) = @_; @@ -4636,14 +4572,14 @@ sub scan_autoconf_traces ($) AM_PATH_PYTHON AM_PROG_CC_C_O); - my $traces = "$ENV{amtraces} "; + my $traces = ($ENV{AUTOCONF} || 'autoconf') . " "; # Use a separator unlikely to be used, not `:', the default, which # has a precise meaning for AC_CONFIG_FILES and so on. $traces .= join (' ', map { "--trace=$_" . ':\$f:\$l::\$n::\${::}%' } @traced); - my $tracefh = new Automake::XFile ("$traces |"); + my $tracefh = new Automake::XFile ("$traces $filename |"); verbose "reading $traces"; while ($_ = $tracefh->getline) @@ -4772,353 +4708,6 @@ sub scan_autoconf_traces ($) } -# &scan_one_autoconf_file ($FILENAME) -# ----------------------------------- -# Scan one file for interesting things. Subroutine of -# &scan_autoconf_files. -sub scan_one_autoconf_file -{ - my ($filename) = @_; - - # Some macros already provide the right traces to enable generic - # code and specific arguments, instead of dedicated code. But - # currently we don't handle traces. Rewrite these dedicated - # macros handling into the generic macro invocation, and let our - # generic case handle them. - - my %generalize = - ( - 'AC_FUNC_ALLOCA' => 'AC_LIBSOURCES([alloca.c])', - 'AC_FUNC_GETLOADAVG' => 'AC_LIBSOURCES([getloadavg.c])', - 'AC_FUNC_MEMCMP' => 'AC_LIBSOURCES([memcmp.c])', - 'AC_STRUCT_ST_BLOCKS' => 'AC_LIBSOURCES([fileblocks.c])', - 'A[CM]_REPLACE_GNU_GETOPT' => 'AC_LIBSOURCES([getopt.c, getopt1.c])', - 'A[CM]_FUNC_STRTOD' => 'AC_LIBSOURCES([strtod.c])', - 'AM_WITH_REGEX' => 'AC_LIBSOURCES([rx.c, rx.h, regex.c, regex.h])', - 'AC_FUNC_MKTIME' => 'AC_LIBSOURCES([mktime.c])', - 'A[CM]_FUNC_ERROR_AT_LINE' => 'AC_LIBSOURCES([error.c, error.h])', - 'A[CM]_FUNC_OBSTACK' => 'AC_LIBSOURCES([obstack.c, obstack.h])', - ); - - my $configfh = new Automake::XFile ("< $filename"); - verbose "reading $filename"; - - my ($in_ac_output, $in_ac_replace) = (0, 0); - while ($_ = $configfh->getline) - { - # Remove comments from current line. - s/\bdnl\b.*$//; - s/\#.*$//; - - # Skip macro definitions. Otherwise we might be confused into - # thinking that a macro that was only defined was actually - # used. - next if /AC_DEFUN/; - - # Follow includes. This is a weirdness commonly in use at - # Cygnus and hopefully nowhere else. - if (/sinclude\((.*)\)/ && -f $1) - { - # $_ being local, if we don't preserve it, when coming - # back we will have $_ undefined, which is bad for the - # the rest of this routine. - my $underscore = $_; - &scan_one_autoconf_file ($1); - $_ = $underscore; - } - - for my $generalize (keys %generalize) - { - s/\b$generalize\b/$generalize{$generalize}/g; - } - - - my $here = "$filename:$."; - - # Populate libobjs array. - if (/LIBOBJS="(.*)\s+\$LIBOBJS"/ - || /LIBOBJS="\$LIBOBJS\s+(.*)"/) - { - foreach my $libobj_iter (split (' ', $1)) - { - if ($libobj_iter =~ /^(.*)\.o(bj)?$/ - || $libobj_iter =~ /^(.*)\.\$ac_objext$/ - || $libobj_iter =~ /^(.*)\.\$\{ac_objext\}$/) - { - $libsources{$1 . '.c'} = $here; - } - } - } - elsif (/AC_LIBOBJ\(([^)]+)\)/) - { - $libsources{unquote_m4_arg ($1) . ".c"} = $here; - } - elsif (/AC_LIBSOURCE\(([^)]+)\)/) - { - $libsources{&unquote_m4_arg ($1)} = $here; - } - elsif (/AC_LIBSOURCES\(([^)]+)\)/) - { - foreach my $lc_iter (split (/[, ]+/, &unquote_m4_arg ($1))) - { - $libsources{$lc_iter} = $here; - } - } - - if (! $in_ac_replace && s/AC_REPLACE_FUNCS\s*\(\[?//) - { - $in_ac_replace = 1; - } - if ($in_ac_replace) - { - $in_ac_replace = 0 if s/[\]\)].*$//; - # Remove trailing backslash. - s/\\$//; - foreach (split) - { - # Need to skip empty elements for Perl 4. - next if $_ eq ''; - $libsources{$_ . '.c'} = $here; - } - } - - if (/$obsolete_rx/o) - { - my $hint = ''; - if ($obsolete_macros{$1} ne '') - { - $hint = '; ' . $obsolete_macros{$1}; - } - file_error ($here, "`$1' is obsolete$hint"); - } - - # Process the AC_OUTPUT and AC_CONFIG_FILES macros. - if (! $in_ac_output && s/(AC_(OUTPUT|CONFIG_FILES))\s*\(\[?//) - { - $in_ac_output = $1; - $ac_config_files_location = $here; - } - if ($in_ac_output) - { - my $closing = 0; - if (s/[\]\),].*$//) - { - $in_ac_output = 0; - $closing = 1; - } - - # Look at potential Makefile.am's. - &scan_autoconf_config_files ($_); - - if ($closing - && scalar keys %make_list == 0 - && @other_input_files == 0) - { - file_error ($ac_config_files_location, - "no files mentioned in `$in_ac_output'"); - exit 1; - } - } - - if (/$AC_CONFIG_AUX_DIR_PATTERN/o) - { - @config_aux_path = &unquote_m4_arg ($1); - $config_aux_dir_set_in_configure_in = $here; - } - - # Check for ansi2knr. - $am_c_prototypes = $here if /AM_C_PROTOTYPES/; - - # Check for `-c -o' code. - $seen_cc_c_o = $here if /AM_PROG_CC_C_O/; - - # Check for NLS support. - if (/AM_GNU_GETTEXT/) - { - $seen_gettext = $here; - $ac_gettext_location = $here; - } - - # Handle configuration headers. A config header of `[$1]' - # means we are actually scanning AM_CONFIG_HEADER from - # aclocal.m4. Same thing with a leading underscore. - if (/(?; } -# Remove one level of brackets and strip leading spaces, -# as does m4 to function arguments. -sub unquote_m4_arg -{ - $_ = shift; - s/^\s*//; - - my @letters = split //; - my @result = (); - my $depth = 0; - - foreach (@letters) - { - if ($_ eq '[') - { - ++$depth; - next if $depth == 1; - } - elsif ($_ eq ']') - { - --$depth; - next if $depth == 0; - # don't count orphan right brackets - $depth = 0 if $depth < 0; - } - push @result, $_; - } - return join '', @result; -} - ################################################################ # print_error ($LEADER, @ARGS) diff --git a/automake.texi b/automake.texi index 0d2997e0..d299aef8 100644 --- a/automake.texi +++ b/automake.texi @@ -915,6 +915,17 @@ necessary because @code{automake} must scan @file{configure.in}, and because @code{automake} uses the knowledge that a @file{Makefile.in} is in a subdirectory to change its behavior in some cases. +@vindex AUTOCONF +Automake will run @code{autoconf} to scan @file{configure.in} and its +dependencies (@file{aclocal.m4}), therefore @code{autoconf} must be in +your @code{PATH}. If there is an @code{AUTOCONF} variable in your +environment it will be used instead of @code{autoconf}, this allows you +to select a particular version of Autoconf. By the way, don't +misunderstand this paragraph: Automake runs @code{autoconf} to +@strong{scan} your @file{configure.in}, this won't build +@file{configure} and you still have to run @code{autoconf} yourself for +this purpose. + @cindex Automake options @cindex Options, Automake @cindex Strictness, command line diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 389d729b..0490fc8b 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ perllibdir = $(pkgvdatadir)/Automake diff --git a/lib/Makefile.in b/lib/Makefile.in index 9c490da0..6311a5c6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = Automake am diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index f0b1995d..fc4db276 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ amdir = $(pkgvdatadir)/am diff --git a/lib/am/compile.am b/lib/am/compile.am index d179f846..217521c3 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -17,11 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -DEFS = @DEFS@ DEFAULT_INCLUDES = %DEFAULT_INCLUDES% -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ mostlyclean-am: mostlyclean-compile mostlyclean-compile: diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index b389d36c..f646f898 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -16,26 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include @SET_MAKE@ @@ -55,20 +39,11 @@ pkgincludedir = $(includedir)/@PACKAGE@ ## Location of top build directory relative to this one. top_builddir = %TOPDIR% -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print ## (eg): $(NORMAL_INSTALL) expands to empty string. @@ -78,18 +53,3 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -## FIXME: Why the heck are _triplet variables not defined from the -## _triplet values? -## FIXME: this should probably use generic %configure_vars method. -## Let's wait until we rely upon traces. -?BUILD?build_alias = @build_alias@ -?BUILD?build_triplet = @build@ -?HOST?host_alias = @host_alias@ -?HOST?host_triplet = @host@ -?TARGET?target_alias = @target_alias@ -?TARGET?target_triplet = @target@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ diff --git a/lib/am/lisp.am b/lib/am/lisp.am index e8071b77..b0378613 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -21,9 +21,6 @@ ## Building. ## ## ---------- ## -EMACS = @EMACS@ -lispdir = @lispdir@ - .el.elc: @echo 'WARNING: Warnings can be ignored. :-)' if test $(EMACS) != no; then \ diff --git a/m4/Makefile.in b/m4/Makefile.in index cb423098..e1311391 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ m4datadir = $(datadir)/aclocal-$(APIVERSION) diff --git a/stamp-vti b/stamp-vti index 0746dcb2..90fbfc78 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 10 April 2002 +@set UPDATED 12 April 2002 @set UPDATED-MONTH April 2002 @set EDITION 1.6a @set VERSION 1.6a diff --git a/tests/Makefile.in b/tests/Makefile.in index 39b071f6..d0696cf2 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -13,62 +13,40 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBS = @LIBS@ MAKEINFO = @MAKEINFO@ @@ -78,16 +56,32 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ +bindir = @bindir@ build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ host_alias = @host_alias@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ pkgvdatadir = @pkgvdatadir@ +prefix = @prefix@ program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ target_alias = @target_alias@ XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test specflags8.test diff --git a/version.texi b/version.texi index 0746dcb2..90fbfc78 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 10 April 2002 +@set UPDATED 12 April 2002 @set UPDATED-MONTH April 2002 @set EDITION 1.6a @set VERSION 1.6a