[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/README,v
From: |
Eric Blake |
Subject: |
Changes to m4/README,v |
Date: |
Tue, 22 Aug 2006 16:16:49 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 06/08/22 16:16:48
Index: README
===================================================================
RCS file: /sources/m4/m4/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- README 19 Jun 2006 13:03:55 -0000 1.10
+++ README 22 Aug 2006 16:16:47 -0000 1.11
@@ -5,7 +5,7 @@
running shell commands, doing arithmetic, etc. Autoconf needs GNU
`m4' for generating `configure' scripts, but not for running them.
-GNU `m4' has been originally written by Rene' Seindal, from Denmark.
+GNU `m4' was originally written by Rene' Seindal, from Denmark.
GNU `m4' has a web site at http://www.gnu.org/software/m4/.
@@ -69,123 +69,19 @@
The testsuite understands --help to tell you more about the current
set of tests.
+If you wish to run bootstrap, the released versions of
+automake and libtool are missing some functionality we need. You
+will need a CVS build of libtool head (1.5.x does not have enough
+functionality), autoconf 2.60 or later, automake 1.9b or later,
+gettext 0.15 or later, and a CVS checkout of gnulib.
-## ------- ##
-## Patches ##
-## ------- ##
+========================================================================
-If you wish to run bootstrap, the released versions of autoconf,
-automake, and libtool are missing some functionality we need. You
-will need a CVS build of libtool head (1.5.x does not have enough
-functionality), and use the 2.59d snapshot of autoconf or a CVS
-build. If you do not use a CVS build of automake, you can instead
-patch automake-1.9.5 or 1.9.6 according to the patch below:
-
---- automake-1.9.5/automake.in.orig 2005-02-12 10:06:56.000000000 +0000
-+++ automake-1.9.5/automake.in 2005-04-20 14:08:05.000000000 +0100
-@@ -142,6 +142,7 @@
- use Automake::RuleDef;
- use Automake::Wrap 'makefile_wrap';
- use File::Basename;
-+use File::Spec;
- use Carp;
-
- ## ----------- ##
-@@ -333,6 +334,10 @@
- # in Makefiles.
- my $am_config_aux_dir = '';
-
-+# Directory to search for AC_LIBSOURCE file, as set by AC_CONFIG_LIBOBJ_DIR
-+# in configure.ac.
-+my $config_libobj_dir = '';
-+
- # Whether AM_GNU_GETTEXT has been seen in configure.ac.
- my $seen_gettext = 0;
- # Whether AM_GNU_GETTEXT([external]) is used.
-@@ -2067,7 +2072,7 @@
-
- if ($iter =~ /\.h$/)
- {
-- require_file_with_macro ($cond, $var, FOREIGN, $iter);
-+ require_libobj_with_macro ($cond, $var, FOREIGN, $iter);
- }
- elsif ($iter ne 'alloca.c')
- {
-@@ -2079,7 +2084,7 @@
- my $bs = var ('BUILT_SOURCES');
- if (! $bs || ! grep (/$rewrite/, $bs->value_as_list_recursive))
- {
-- require_file_with_macro ($cond, $var, FOREIGN, $iter);
-+ require_libobj_with_macro ($cond, $var, FOREIGN, $iter);
- }
- }
- }
-@@ -2092,7 +2097,7 @@
- $lt ||= '';
- $var->requires_variables ("address@hidden@ used", $lt . 'ALLOCA');
- $dep_files{'$(DEPDIR)/alloca.P' . $myobjext} = 1;
-- require_file_with_macro ($cond, $var, FOREIGN, 'alloca.c');
-+ require_libobj_with_macro ($cond, $var, FOREIGN, 'alloca.c');
- &saw_extension ('c');
- }
-
-@@ -4636,6 +4641,7 @@
- AC_CONFIG_AUX_DIR => 1,
- AC_CONFIG_FILES => 1,
- AC_CONFIG_HEADERS => 1,
-+ AC_CONFIG_LIBOBJ_DIR => 1,
- AC_CONFIG_LINKS => 1,
- AC_INIT => 0,
- AC_LIBSOURCE => 1,
-@@ -4731,6 +4737,12 @@
- push @config_headers, $spec;
- }
- }
-+ elsif ($macro eq 'AC_CONFIG_LIBOBJ_DIR')
-+ {
-+ $config_libobj_dir = $args[1];
-+ $relative_dir = '.';
-+ check_directory ($config_libobj_dir, $where);
-+ }
- elsif ($macro eq 'AC_CONFIG_LINKS')
- {
- foreach my $spec (split (' ', $args[1]))
-@@ -5761,6 +5773,15 @@
- use constant IN_COMMENT => 2;
- my $prev_state = IN_RULE_DEF;
-
-+ # Calculate the relative path from this Makefile to LIBOBJDIR.
-+ my $am_libobj_dir = '';
-+ unless ($config_libobj_dir eq '')
-+ {
-+ my $dir = File::Spec->abs2rel ($config_libobj_dir, $relative_dir);
-+ $am_libobj_dir = "$dir/" unless $dir eq '';
-+ }
-+ &define_variable ('LIBOBJDIR', "$am_libobj_dir", INTERNAL);
-+
- while ($_ = $am_file->getline)
- {
- $where->set ("$amfile:$.");
-@@ -6975,6 +6996,22 @@
- require_file ($macro->rdef ($cond)->location, $mystrict, @files);
- }
-
-+# &require_libobj_with_macro ($COND, $MACRO, $MYSTRICT, @FILES)
-+# -------------------------------------------------------------
-+sub require_libobj_with_macro ($$$@)
-+{
-+ my ($cond, $macro, $mystrict, @files) = @_;
-+ $macro = rvar ($macro) unless ref $macro;
-+ if ($config_libobj_dir eq '')
-+ {
-+ require_file ($macro->rdef ($cond)->location, $mystrict, @files);
-+ }
-+ else
-+ {
-+ require_file_internal ($macro->rdef ($cond)->location, $mystrict,
-+ $config_libobj_dir, @files);
-+ }
-+}
+Copyright (C) 2000, 2005, 2006 Free Software Foundation, Inc.
- # &require_conf_file ($WHERE, $MYSTRICT, @FILES)
- # ----------------------------------------------
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license is included in the ``GNU Free
+Documentation License'' file as part of this distribution.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to m4/README,v,
Eric Blake <=