60-mying-changes.patches

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in: `my' the globals.

Index: automake.in
--- automake.in Fri, 23 Feb 2001 00:01:11 +0100 akim (am/f/39_automake.i 1.67 
755)
+++ automake.in Sat, 24 Feb 2001 01:48:00 +0100 akim (am/f/39_automake.i 1.67 
755)
@@ -31,56 +31,56 @@

 # Parameters set by configure.  Not to be changed.  NOTE: assign
 # VERSION as string so that eg version 0.30 will print correctly.
-$VERSION = "@VERSION@";
-$PACKAGE = "@PACKAGE@";
-$prefix = "@prefix@";
-$am_dir = "@datadir@/@PACKAGE@";
+my $VERSION = "@VERSION@";
+my $PACKAGE = "@PACKAGE@";
+my $prefix = "@prefix@";
+my $am_dir = "@datadir@/@PACKAGE@";

 # String constants.
-$IGNORE_PATTERN = "^##([^#].*)?\$";
-$WHITE_PATTERN = "^[ \t]*\$";
-$COMMENT_PATTERN = "^#";
-$TARGET_PATTERN="[\$a-zA-Z_.][-.a-zA-Z0-9_(){}/\$]*";
-$RULE_PATTERN = "^($TARGET_PATTERN) *:([^=].*|)\$";
-$SUFFIX_RULE_PATTERN = "^\\.([a-zA-Z0-9]+)\\.([a-zA-Z0-9]+)\$";
+my $IGNORE_PATTERN = "^##([^#].*)?\$";
+my $WHITE_PATTERN = "^[ \t]*\$";
+my $COMMENT_PATTERN = "^#";
+my $TARGET_PATTERN="[\$a-zA-Z_.][-.a-zA-Z0-9_(){}/\$]*";
+my $RULE_PATTERN = "^($TARGET_PATTERN) *:([^=].*|)\$";
+my $SUFFIX_RULE_PATTERN = "^\\.([a-zA-Z0-9]+)\\.([a-zA-Z0-9]+)\$";
 # Only recognize leading spaces, not leading tabs.  If we recognize
 # leading tabs here then we need to make the reader smarter, because
 # otherwise it will think rules like `foo=bar; \' are errors.
-$MACRO_PATTERN = "^ *(address@hidden)[ \t]*([:+]?)=[ \t]*(.*)\$";
-$BOGUS_MACRO_PATTERN = "^ *([^ \t]*)[ \t]*([:+]?)=[ \t]*(.*)\$";
-$GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
-$IF_PATTERN = "^if[ \t]+\([A-Za-z][A-Za-z0-9_]*\)[ \t]*\(#.*\)?\$";
-$ELSE_PATTERN = "^else[ \t]*\(#.*\)?\$";
-$ENDIF_PATTERN = "^endif[ \t]*\(#.*\)?\$";
-$PATH_PATTERN='(\\w|[/.-])+';
+my $MACRO_PATTERN = "^ *(address@hidden)[ \t]*([:+]?)=[ \t]*(.*)\$";
+my $BOGUS_MACRO_PATTERN = "^ *([^ \t]*)[ \t]*([:+]?)=[ \t]*(.*)\$";
+my $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
+my $IF_PATTERN = "^if[ \t]+\([A-Za-z][A-Za-z0-9_]*\)[ \t]*\(#.*\)?\$";
+my $ELSE_PATTERN = "^else[ \t]*\(#.*\)?\$";
+my $ENDIF_PATTERN = "^endif[ \t]*\(#.*\)?\$";
+my $PATH_PATTERN='(\\w|[/.-])+';
 # This will pass through anything not of the prescribed form.
-$INCLUDE_PATTERN = "^include[ 
\t]+((\\\$\\\(top_srcdir\\\)/${PATH_PATTERN})|(\\\$\\\(srcdir\\\)/${PATH_PATTERN})|([^/\\\$]${PATH_PATTERN}))[
 \t]*(#.*)?\$";
+my $INCLUDE_PATTERN = "^include[ 
\t]+((\\\$\\\(top_srcdir\\\)/${PATH_PATTERN})|(\\\$\\\(srcdir\\\)/${PATH_PATTERN})|([^/\\\$]${PATH_PATTERN}))[
 \t]*(#.*)?\$";

 # Some regular expressions.  One reason to put them here is that it
 # makes indentation work better in Emacs.
-$AC_CONFIG_AUX_DIR_PATTERN = "AC_CONFIG_AUX_DIR\\(([^)]+)\\)";
-$AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^,)]+)[,)]";
-$AM_PACKAGE_VERSION_PATTERN = "^\\s*\\[?([^]\\s]+)\\]?\\s*\$";
+my $AC_CONFIG_AUX_DIR_PATTERN = "AC_CONFIG_AUX_DIR\\(([^)]+)\\)";
+my $AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^,)]+)[,)]";
+my $AM_PACKAGE_VERSION_PATTERN = "^\\s*\\[?([^]\\s]+)\\]?\\s*\$";
 # Note that there is no AC_PATH_TOOL.  But we don't really care.
-$AC_CHECK_PATTERN = "AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\\(\\[?(\\w+)";
-$AM_MISSING_PATTERN = "AM_MISSING_PROG\\(\\[?(\\w+)";
+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.
-$AC_SUBST_PATTERN = "AC_SUBST\\(\\[?(\\w+)";
-$AM_CONDITIONAL_PATTERN = "AM_CONDITIONAL\\((\\w+)";
+my $AC_SUBST_PATTERN = "AC_SUBST\\(\\[?(\\w+)";
+my $AM_CONDITIONAL_PATTERN = "AM_CONDITIONAL\\((\\w+)";

 # Constants to define the "strictness" level.
-$FOREIGN = 0;
-$GNU = 1;
-$GNITS = 2;
+my $FOREIGN = 0;
+my $GNU = 1;
+my $GNITS = 2;

 # These constants are returned by lang_*_rewrite functions.
 # LANG_SUBDIR means that the resulting object file should be in a
 # subdir if the source file is.  In this case the file name cannot
 # have `..' components.
-$LANG_IGNORE = 0;
-$LANG_PROCESS = 1;
-$LANG_SUBDIR = 2;
+my $LANG_IGNORE = 0;
+my $LANG_PROCESS = 1;
+my $LANG_SUBDIR = 2;

 

@@ -89,161 +89,161 @@
 # Variables related to the options.

 # TRUE if we should always generate Makefile.in.
-$force_generation = 1;
+my $force_generation = 1;

 # Strictness level as set on command line.
-$default_strictness = $GNU;
+my $default_strictness = $GNU;

 # Name of strictness level, as set on command line.
-$default_strictness_name = 'gnu';
+my $default_strictness_name = 'gnu';

 # This is TRUE if automatic dependency generation code should be
 # included in generated Makefile.in.
-$cmdline_use_dependencies = 1;
+my $cmdline_use_dependencies = 1;

 # TRUE if in verbose mode.
-$verbose = 0;
+my $verbose = 0;

 # This holds our (eventual) exit status.  We don't actually exit until
 # we have processed all input files.
-$exit_status = 0;
+my $exit_status = 0;

 # From the Perl manual.
-$symlink_exists = (eval 'symlink ("", "");', $@ eq '');
+my $symlink_exists = (eval 'symlink ("", "");', $@ eq '');

 # TRUE if missing standard files should be installed.
-$add_missing = 0;
+my $add_missing = 0;

 # TRUE if we should copy missing files; otherwise symlink if possible.
-$copy_missing = 0;
+my $copy_missing = 0;

 # TRUE if we should always update files that we know about.
-$force_missing = 0;
+my $force_missing = 0;


 # Variables filled during files scanning.

 # Name of the top autoconf input: `configure.ac' or `configure.in'.
-$configure_ac = '';
+my $configure_ac = '';

 # Files found by scanning configure.ac for LIBOBJS.
-%libsources = ();
+my %libsources = ();

 # True if AM_C_PROTOTYPES appears in configure.ac.
-$am_c_prototypes = 0;
+my $am_c_prototypes = 0;

 # Names used in AC_CONFIG_HEADER call.  @config_fullnames holds the
 # name which appears in AC_CONFIG_HEADER, colon and all.
 # @config_names holds the file names.  @config_headers holds the '.in'
 # files.  Ordinarily these are similar, but they can be different if
 # the weird "NAME:FILE" syntax is used.
address@hidden = ();
address@hidden = ();
address@hidden = ();
+my @config_fullnames = ();
+my @config_names = ();
+my @config_headers = ();
 # Line number at which AC_CONFIG_HEADER appears in configure.ac.
-$config_header_line = 0;
+my $config_header_line = 0;

 # Directory where output files go.  Actually, output files are
 # relative to this directory.
-$output_directory = '.';
+my $output_directory = '.';

 # List of Makefile.am's to process, and their corresponding outputs.
address@hidden = ();
-%output_files = ();
+my @input_files = ();
+my %output_files = ();

 # Complete list of Makefile.am's that exist.
address@hidden = ();
+my @configure_input_files = ();

 # List of files in AC_OUTPUT without Makefile.am, and their outputs.
address@hidden = ();
+my @other_input_files = ();
 # Line number at which AC_OUTPUT seen.
-$ac_output_line = 0;
+my $ac_output_line = 0;

 # List of directories to search for configure-required files.  This
 # can be set by AC_CONFIG_AUX_DIR.
address@hidden = ('.', '..', '../..');
-$config_aux_dir = '';
+my @config_aux_path = ('.', '..', '../..');
+my $config_aux_dir = '';

 # Whether AC_PROG_MAKE_SET has been seen in configure.ac.
-$seen_make_set = 0;
+my $seen_make_set = 0;

 # Whether AM_GNU_GETTEXT has been seen in configure.ac.
-$seen_gettext = 0;
+my $seen_gettext = 0;
 # Line number at which AM_GNU_GETTEXT seen.
-$ac_gettext_line = 0;
+my $ac_gettext_line = 0;

 # Whether ALL_LINGUAS has been seen.
-$seen_linguas = '';
+my $seen_linguas = '';
 # The actual text.
-$all_linguas = '';
+my $all_linguas = '';
 # Line number at which it appears.
-$all_linguas_line = 0;
+my $all_linguas_line = 0;

 # 1 if AC_PROG_INSTALL seen.
-$seen_prog_install = 0;
+my $seen_prog_install = 0;

 # Whether AC_PATH_XTRA has been seen in configure.ac.
-$seen_path_xtra = 0;
+my $seen_path_xtra = 0;

 # TRUE if AC_DECL_YYTEXT was seen.
-$seen_decl_yytext = 0;
+my $seen_decl_yytext = 0;

 # TRUE if we've seen AC_CANONICAL_(HOST|SYSTEM).  The presence of
 # AC_CHECK_TOOL also sets this.
-$seen_canonical = 0;
+my $seen_canonical = 0;

 # TRUE if we've seen AC_ARG_PROGRAM.
-$seen_arg_prog = 0;
+my $seen_arg_prog = 0;

 # TRUE if we've seen AC_PROG_LIBTOOL.
-$seen_libtool = 0;
-$libtool_line = 0;
+my $seen_libtool = 0;
+my $libtool_line = 0;

 # Files installed by libtoolize.
address@hidden = ('ltmain.sh', 'config.guess', 'config.sub');
+my @libtoolize_files = ('ltmain.sh', 'config.guess', 'config.sub');
 # ltconfig appears here for compatibility with old versions of libtool.
address@hidden = ('ltconfig', 'ltcf-c.sh', 'ltcf-cxx.sh',
+my @libtoolize_sometimes = ('ltconfig', 'ltcf-c.sh', 'ltcf-cxx.sh',
                         'ltcf-gcj.sh');

 # TRUE if we've seen AM_MAINTAINER_MODE.
-$seen_maint_mode = 0;
+my $seen_maint_mode = 0;

 # Actual version we've seen.
-$package_version = '';
+my $package_version = '';

 # Line number where we saw version definition.
-$package_version_line = 0;
+my $package_version_line = 0;

 # TRUE if we've seen AM_PATH_LISPDIR.
-$seen_lispdir = 0;
+my $seen_lispdir = 0;

 # TRUE if we've seen AM_CHECK_PYTHON.
-$seen_pythondir = 0;
+my $seen_pythondir = 0;

 # TRUE if we've seen AC_EXEEXT.
-$seen_exeext = 0;
+my $seen_exeext = 0;

 # TRUE if we've seen AC_OBJEXT.
-$seen_objext = 0;
+my $seen_objext = 0;

 # TRUE if we've seen AC_ENABLE_MULTILIB.
-$seen_multilib = 0;
+my $seen_multilib = 0;

 # TRUE if we've seen AM_PROG_CC_C_O
-$seen_cc_c_o = 0;
+my $seen_cc_c_o = 0;

 # TRUE if we've seen AM_INIT_AUTOMAKE.
-$seen_init_automake = 0;
+my $seen_init_automake = 0;

 # Hash table of discovered configure substitutions.  Keys are names,
 # values are `FILE:LINE' strings which are used by error message
 # generation.
-%configure_vars = ();
+my %configure_vars = ();

 # This is used to keep track of which variable definitions we are
 # scanning.  It is only used in certain limited ways, but it has to be
 # global.  It is declared just for documentation purposes.
-%vars_scanned = ();
+my %vars_scanned = ();

 # Charsets used by maintainer and in distribution.  MAINT_CHARSET is
 # handled in a funny way: if seen in the top-level Makefile.am, it is
@@ -254,24 +254,24 @@
 # package; it can only be set at top-level.
 # FIXME: this yields bugs when rebuilding.  What to do?  Always
 # read (and sometimes discard) top-level Makefile.am?
-$maint_charset = '';
-$dist_charset = 'utf8';                # recode doesn't support this yet.
+my $maint_charset = '';
+my $dist_charset = 'utf8';             # recode doesn't support this yet.

 # Name of input file ("Makefile.in") and output file ("Makefile.am").
 # These have no directory components.
-$am_file_name = '';
-$in_file_name = '';
+my $am_file_name = '';
+my $in_file_name = '';

 # TRUE if --cygnus seen.
-$cygnus_mode = 0;
+my $cygnus_mode = 0;

 # Hash table of AM_CONDITIONAL variables seen in configure.
-%configure_cond = ();
+my %configure_cond = ();

 # 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.
-%obsolete_macros =
+my %obsolete_macros =
     (
      'AC_FEATURE_CTYPE', "use \`AC_HEADER_STDC'",
      'AC_FEATURE_ERRNO', "add \`strerror' to \`AC_REPLACE_FUNCS(...)'",
@@ -309,18 +309,18 @@
      );

 # Regexp to match the above macros.
-$obsolete_rx = '(\b' . join ('\b|\b', keys %obsolete_macros) . '\b)';
+my $obsolete_rx = '(\b' . join ('\b|\b', keys %obsolete_macros) . '\b)';

 # This maps extensions onto language names.
-%extension_map = ();
+my %extension_map = ();

 # This maps languages names onto properties.
-%language_map = ();
+my %language_map = ();

 # This holds all the files that would go in `dist_common' which we
 # discovered while scanning configure.ac.  We might distribute these
 # in the top-level Makefile.in.
-%configure_dist_common = ();
+my %configure_dist_common = ();
 

 # Initialize global constants and our list of languages that are
@@ -7217,7 +7217,7 @@ sub am_install_var
 # Each key in this hash is the name of a directory holding a
 # Makefile.in.  These variables are local to `is_make_dir'.
 %make_dirs = ();
-$make_dirs_set = 0;
+my $make_dirs_set = 0;

 sub is_make_dir
 {
@@ -7244,12 +7244,12 @@ sub is_make_dir
 ################################################################

 # This variable is local to the "require file" set of functions.
address@hidden = ();
+my @require_file_paths = ();

 # If a file name appears as a key in this hash, then it has already
 # been checked for.  This variable is local to the "require file"
 # functions.
-%require_file_found = ();
+%require_file_found = ();

 # See if we want to push this file onto dist_common.  This function
 # encodes the rules for deciding when to do so.