[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-52-
|
From: |
Eric Blake |
|
Subject: |
[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-52-g410176a |
|
Date: |
Fri, 01 Feb 2008 05:37:02 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=410176a44990a565e22770e7d66bbc739cf0dcb4
The branch, master has been updated
via 410176a44990a565e22770e7d66bbc739cf0dcb4 (commit)
via fdc33823e6a6e77d38d44c31a3ff3072509a2445 (commit)
via c2f1e561a36e39a2fad6655cfc3ca7a87782934a (commit)
from 7716bd11c4d8c59919568c5dc9f787c3a1c0eb40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 410176a44990a565e22770e7d66bbc739cf0dcb4
Author: Eric Blake <address@hidden>
Date: Thu Jan 31 22:22:32 2008 -0700
Kill hack for M4 1.4.4.
* configure.ac (AM_GNU_GETTEXT_INTL_SUBDIR): Delete, now that
we require new enough autoconf which in turn requires M4 1.4.5.
Signed-off-by: Eric Blake <address@hidden>
commit fdc33823e6a6e77d38d44c31a3ff3072509a2445
Author: Eric Blake <address@hidden>
Date: Thu Jan 31 21:44:38 2008 -0700
Depend on new libtool to use non-recursive build.
* configure.ac (LT_PREREQ): Bump to alpha release version.
(LTDL_INIT): Choose nonrecursive mode. Perform sanity check that
installed libtool has correct symbols.
* Makefile.am (SUBDIRS): Drop ltdl, now that it is built from the
top level.
(AM_CPPFLAGS): Drop directories covered by libtool.
(AM_LDFLAGS): Drop -no-undefined, covered by libtool.
(include_HEADERS, noinst_LTLIBRARIES, EXTRA_LTLIBRARIES): New
macros, used by libtool.
(lib_LTLIBRARIES): Also used by libtool.
(ltdl/libltdlc.la): Delete, now that libtool does this.
* bootstrap: Mention new requirements.
(LIBTOOLIZE): Provide default program, and run libtoolize prior to
autoreconf.
(autoreconf): Also neutralize libtoolize, since it is run early.
* HACKING: Mention updated prerequisites.
Signed-off-by: Eric Blake <address@hidden>
commit c2f1e561a36e39a2fad6655cfc3ca7a87782934a
Author: Eric Blake <address@hidden>
Date: Thu Jan 31 21:35:27 2008 -0700
Fix whitespace.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 121 +++++++++++++++++++++++++++++++++---------------------
HACKING | 2 +-
Makefile.am | 43 ++++++++++---------
bootstrap | 27 +++++++++---
configure.ac | 30 +++++++------
ltdl/.cvsignore | 1 +
ltdl/.gitignore | 1 +
7 files changed, 136 insertions(+), 89 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 905e695..2ad8299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2008-01-31 Eric Blake <address@hidden>
+
+ Kill hack for M4 1.4.4.
+ * configure.ac (AM_GNU_GETTEXT_INTL_SUBDIR): Delete, now that
+ we require new enough autoconf which in turn requires M4 1.4.5.
+
+2008-01-31 Gary V. Vaughan <address@hidden>
+ and Eric Blake <address@hidden>
+
+ Depend on new libtool to use non-recursive build.
+ * configure.ac (LT_PREREQ): Bump to alpha release version.
+ (LTDL_INIT): Choose nonrecursive mode. Perform sanity check that
+ installed libtool has correct symbols.
+ * Makefile.am (SUBDIRS): Drop ltdl, now that it is built from the
+ top level.
+ (AM_CPPFLAGS): Drop directories covered by libtool.
+ (AM_LDFLAGS): Drop -no-undefined, covered by libtool.
+ (include_HEADERS, noinst_LTLIBRARIES, EXTRA_LTLIBRARIES): New
+ macros, used by libtool.
+ (lib_LTLIBRARIES): Also used by libtool.
+ (ltdl/libltdlc.la): Delete, now that libtool does this.
+ * bootstrap: Mention new requirements.
+ (LIBTOOLIZE): Provide default program, and run libtoolize prior to
+ autoreconf.
+ (autoreconf): Also neutralize libtoolize, since it is run early.
+ * HACKING: Mention updated prerequisites.
+
2008-01-28 Ralf Wildenhues <address@hidden>
Fix build failure if installed libltdl is used.
@@ -45,53 +72,53 @@
(renamesyms): Likewise.
* modules/stdlib.c (setenv): Likewise.
- Stage 12b: add m4_string_pair.
- Make passing quote delimiters around more efficient.
- Memory impact: none.
- Speed impact: slight penalty, due to more bookkeeping.
- * m4/m4module.h (m4_string_pair): New type.
- (m4_get_syntax_quotes, m4_get_syntax_comments): New prototypes.
- (m4_symbol_value_print, m4_symbol_print, m4_shipout_string_trunc):
- Alter signature.
- * m4/m4private.h (struct m4_string): Delete.
- (struct m4_syntax_table): Combine quote and comment members.
- (m4_get_syntax_lquote, m4_get_syntax_rquote, m4_get_syntax_bcomm)
- (m4_get_syntax_ecomm): Adjust accessors.
- (m4_get_syntax_quotes, m4_get_syntax_comments): New fast
- accessors.
- * m4/symtab.c (m4_symbol_value_print, m4_symbol_print):
- Alter signatures.
- * m4/input.c (string_print, composite_print, m4_input_print):
- All callers updated.
- * m4/syntax.c (m4_syntax_delete, m4_set_syntax)
- (check_is_single_quotes, m4_set_quotes, set_quote_age)
- (m4_get_syntax_lquote, m4_get_syntax_rquote)
- (m4_get_syntax_quotes, check_is_single_comments, m4_set_comment)
- (m4_get_syntax_bcomm, m4_get_syntax_ecomm)
- (m4_get_syntax_comments): Likewise.
- * m4/macro.c (trace_prepre, trace_pre, m4_push_args): Likewise.
- * m4/output.c (m4_shipout_string, m4_shipout_string_trunc):
- Likewise.
- * modules/m4.c (dumpdef, m4_make_temp): Likewise.
- * src/freeze.c (produce_frozen_state): Likewise.
- * tests/freeze.at (reloading unknown builtin): Update test.
-
- Stage 12a: make m4_symbol_chain a union.
- Shrink size of symbol chains by using a union.
- Memory impact: slight improvement, due to smaller struct.
- Speed impact: slight improvement, due to less bookkeeping.
- * m4/m4private.h (enum m4__symbol_chain_type): New enum.
- (struct m4_symbol_chain): Rename...
- (struct m4__symbol_chain): ...to this, since it is internal.
- * m4/symtab.c (m4_symbol_value_copy, m4_symbol_value_print): All
- callers updated.
- * m4/input.c (struct m4_input_block, m4__push_symbol)
- (composite_peek, composite_read, composite_unget)
- (composite_clean, composite_print, m4__make_text_link)
- (append_quote_token): Likewise.
- * m4/macro.c (expand_macro, arg_mark, m4_arg_symbol, m4_arg_text)
- (m4_arg_equal, m4_arg_len, m4_make_argv_ref, m4_push_arg)
- (m4_push_args): Likewise.
+ Stage 12b: add m4_string_pair.
+ Make passing quote delimiters around more efficient.
+ Memory impact: none.
+ Speed impact: slight penalty, due to more bookkeeping.
+ * m4/m4module.h (m4_string_pair): New type.
+ (m4_get_syntax_quotes, m4_get_syntax_comments): New prototypes.
+ (m4_symbol_value_print, m4_symbol_print, m4_shipout_string_trunc):
+ Alter signature.
+ * m4/m4private.h (struct m4_string): Delete.
+ (struct m4_syntax_table): Combine quote and comment members.
+ (m4_get_syntax_lquote, m4_get_syntax_rquote, m4_get_syntax_bcomm)
+ (m4_get_syntax_ecomm): Adjust accessors.
+ (m4_get_syntax_quotes, m4_get_syntax_comments): New fast
+ accessors.
+ * m4/symtab.c (m4_symbol_value_print, m4_symbol_print):
+ Alter signatures.
+ * m4/input.c (string_print, composite_print, m4_input_print):
+ All callers updated.
+ * m4/syntax.c (m4_syntax_delete, m4_set_syntax)
+ (check_is_single_quotes, m4_set_quotes, set_quote_age)
+ (m4_get_syntax_lquote, m4_get_syntax_rquote)
+ (m4_get_syntax_quotes, check_is_single_comments, m4_set_comment)
+ (m4_get_syntax_bcomm, m4_get_syntax_ecomm)
+ (m4_get_syntax_comments): Likewise.
+ * m4/macro.c (trace_prepre, trace_pre, m4_push_args): Likewise.
+ * m4/output.c (m4_shipout_string, m4_shipout_string_trunc):
+ Likewise.
+ * modules/m4.c (dumpdef, m4_make_temp): Likewise.
+ * src/freeze.c (produce_frozen_state): Likewise.
+ * tests/freeze.at (reloading unknown builtin): Update test.
+
+ Stage 12a: make m4_symbol_chain a union.
+ Shrink size of symbol chains by using a union.
+ Memory impact: slight improvement, due to smaller struct.
+ Speed impact: slight improvement, due to less bookkeeping.
+ * m4/m4private.h (enum m4__symbol_chain_type): New enum.
+ (struct m4_symbol_chain): Rename...
+ (struct m4__symbol_chain): ...to this, since it is internal.
+ * m4/symtab.c (m4_symbol_value_copy, m4_symbol_value_print): All
+ callers updated.
+ * m4/input.c (struct m4_input_block, m4__push_symbol)
+ (composite_peek, composite_read, composite_unget)
+ (composite_clean, composite_print, m4__make_text_link)
+ (append_quote_token): Likewise.
+ * m4/macro.c (expand_macro, arg_mark, m4_arg_symbol, m4_arg_text)
+ (m4_arg_equal, m4_arg_len, m4_make_argv_ref, m4_push_arg)
+ (m4_push_args): Likewise.
2008-01-23 Eric Blake <address@hidden>
diff --git a/HACKING b/HACKING
index c5d07c8..aefa74f 100644
--- a/HACKING
+++ b/HACKING
@@ -66,7 +66,7 @@ and is not part of a release distribution.
package
- A git checkout of Autoconf (will become Autoconf 2.62)
- Automake 1.10.1 or later
- - CVS Head of Libtool (will become Libtool 2.0)
+ - Libtool 2.1b or later
- Gettext 0.16 or later
- Help2man 1.29 or later
- LZMA Utils 4.32 or later (from <http://tukaani.org/lzma/>)
diff --git a/Makefile.am b/Makefile.am
index 3d2fe4a..2ef7261 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,34 +23,44 @@
config_aux_dir = build-aux
config_macro_dir= ltdl/m4
-SUBDIRS = ltdl po gnu tests/gnu .
+SUBDIRS = po gnu tests/gnu .
ACLOCAL_AMFLAGS = -I ltdl/m4
AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = -I. -I$(srcdir) \
- -Ignu -I$(srcdir)/gnu \
- -Im4 -I$(srcdir)/m4 \
- $(LTDLINCL)
+
+# Prime the variables that will be augmented by libtool.
# FIXME - the -export-symbols-regex ".*" is a hack to work around the
# fact that on cygwin, the convenience library libltdl exports symbols,
# which effectively disables the auto-exporting of all other symbols.
# Revisit this if libtool on cygwin improves.
# See http://lists.gnu.org/archive/html/libtool-patches/2007-02/msg00062.html
-AM_LDFLAGS = -no-undefined -export-dynamic -export-symbols-regex ".*"
-
-EXTRA_DIST = bootstrap \
- $(config_aux_dir)/mkstamp \
- $(config_macro_dir)/gnulib-cache.m4
+AM_CPPFLAGS =
+AM_LDFLAGS = -export-dynamic -export-symbols-regex ".*"
+EXTRA_DIST =
+BUILT_SOURCES =
CLEANFILES =
DISTCLEANFILES =
MOSTLYCLEANFILES=
+
+include_HEADERS =
+noinst_LTLIBRARIES=
+lib_LTLIBRARIES =
+EXTRA_LTLIBRARIES=
+
+# Include Libtool's rules.
+include ltdl/Makefile.inc
+
+# Additional configuration.
+AM_CPPFLAGS += -Ignu -I$(srcdir)/gnu \
+ -Im4 -I$(srcdir)/m4
+EXTRA_DIST += bootstrap \
+ $(config_aux_dir)/mkstamp \
+ $(config_macro_dir)/gnulib-cache.m4
MAINTAINERCLEANFILES = \
ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
config-h.in configure stamp-h.in \
po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
-BUILT_SOURCES =
-
MKSTAMP = $(SHELL) $(srcdir)/$(config_aux_dir)/mkstamp
# Make sure config.status is regenerated when the version timestamp changes
@@ -202,7 +212,7 @@ EXTRA_DIST += \
## libm4 ##
## ----- ##
-lib_LTLIBRARIES = m4/libm4.la
+lib_LTLIBRARIES += m4/libm4.la
nobase_include_HEADERS = \
m4/m4module.h
@@ -234,13 +244,6 @@ dist-hook:
EXTRA_DIST += m4/system_.h
-## ------- ##
-## libltdl ##
-## ------- ##
-
-ltdl/libltdlc.la:
- cd ltdl && $(MAKE) $(MAKEFLAGS) libltdlc.la
-
## -------------- ##
## Documentation. ##
## -------------- ##
diff --git a/bootstrap b/bootstrap
index 2dcede2..a66eb03 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2008-01-28
+# bootstrap (GNU M4) version 2008-01-31
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
# This is free software: you are free to change and redistribute it.
@@ -35,13 +35,13 @@
# You can also set the following variables to help $progname
# locate the right tools:
-# AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, M4, RM, SED, WGET
+# AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, LIBTOOLIZE, M4, RM, SED, WGET
# This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
# out to parts of the GNU Build Platform. Currently this requires GNU
# Gettext 0.16 or better, a git snapshot of Autoconf 2.61a or better,
-# GNU M4 1.4.x or better, Automake 1.10.1 or better, a CVS snapshot of
-# Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.
+# GNU M4 1.4.5 or better, Automake 1.10.1 or better, Libtool 2.1b or better,
+# and the latest git or CVS checkout of Gnulib.
# Libtool must be installed; either with the same --prefix as
# automake, or made accessible to aclocal's search path via
# $AUTOMAKE_prefix/share/aclocal/dirlist.
@@ -52,6 +52,7 @@
: ${AUTORECONF=autoreconf}
: ${AWK=awk}
: ${GNULIB_TOOL=gnulib-tool}
+: ${LIBTOOLIZE=libtoolize}
: ${M4=m4}
: ${RM=rm -f}
: ${SED=sed}
@@ -400,6 +401,17 @@ fi
func_echo "running: $AUTOPOINT --force"
$AUTOPOINT --force
+## ----------- ##
+## Libtoolize. ##
+## ----------- ##
+
+# Autoreconf runs aclocal before libtoolize, which causes spurious
+# warnings if the initial aclocal is confused by the libtoolized
+# (or worse out-of-date) macro directory.
+func_echo "running: $LIBTOOLIZE --force --copy --install"
+${LIBTOOLIZE} --force --copy --install
+
+
## ---------------------------- ##
## Find the gnulib module tree. ##
## ---------------------------- ##
@@ -470,10 +482,11 @@ $bailout_cb
## Autoreconf. ##
## ----------- ##
-# Disable autopoint, since it was already done above.
-func_echo "running: AUTOPOINT=true" \
+# Disable autopoint and libtoolize, since they were already done above.
+func_echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
"$AUTORECONF --force --verbose --install --no-recursive"
-AUTOPOINT=true $AUTORECONF --force --verbose --install --no-recursive
+AUTOPOINT=true LIBTOOLIZE=true \
+ $AUTORECONF --force --verbose --install --no-recursive
## ---------------------------------------- ##
diff --git a/configure.ac b/configure.ac
index 4523dbc..589c4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,10 +87,24 @@ M4_CHECK_DEBUGGING
## ----------------------- ##
## Libtool initialization. ##
## ----------------------- ##
-LT_PREREQ([2.1a])
+LT_PREREQ([2.1b])
LT_CONFIG_LTDL_DIR([ltdl])
LT_INIT([shared dlopen win32-dll])
-LTDL_INIT
+LTDL_INIT([nonrecursive])
+
+# The lt_dlhandle_iterate symbol was added with libtool-2.2
+if test "x$with_included_ltdl" != "xyes"; then
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$CFLAGS $LTDLINCL"
+ LDFLAGS="$LDFLAGS $LIBLTDL"
+ AC_CHECK_LIB([ltdl], [lt_dlhandle_iterate],
+ [],
+ [AC_MSG_ERROR([installed libltdl is too old])])
+ LDFLAGS="$save_LDFLAGS"
+ CFLAGS="$save_CFLAGS"
+fi
+
# Use gcc's -pipe option if available: for faster compilation.
case "$CFLAGS" in
@@ -145,18 +159,6 @@ AC_SUBST([PREOPEN_DEPENDENCIES])
## ---------------- ##
## Gettext support. ##
## ---------------- ##
-dnl M4 1.4.4 and earlier had a bug that tracing a macro made it falsely
-dnl appear as defined with an empty definition, even though `invoking'
-dnl the macro resulted in the macro name. Gettext relies on whether
-dnl AM_GNU_GETTEXT_INTL_SUBDIR is defined, and automake traces this
-dnl macro, but we don't want to use an intl subdir, hence this workaround
-dnl to allow bootstrapping even on systems with old M4.
-dnl http://lists.gnu.org/archive/html/bug-gnu-utils/2006-11/msg00096.html
-m4_ifdef([AM_GNU_GETTEXT_INTL_SUBDIR],
- [m4_if(m4_defn([AM_GNU_GETTEXT_INTL_SUBDIR]),[],
- [m4_ifval(AM_GNU_GETTEXT_INTL_SUBDIR,
- [m4_popdef([AM_GNU_GETTEXT_INTL_SUBDIR])])])])
-
AM_GNU_GETTEXT([external], [need-formatstring-macros])
AM_GNU_GETTEXT_VERSION([0.16])
M4_GNU_GETTEXT
diff --git a/ltdl/.cvsignore b/ltdl/.cvsignore
index aec0bad..c2d1277 100644
--- a/ltdl/.cvsignore
+++ b/ltdl/.cvsignore
@@ -21,6 +21,7 @@ lt*.c
lt*.h
Makefile.am
Makefile.in
+Makefile.inc
Makefile
README
slist.c
diff --git a/ltdl/.gitignore b/ltdl/.gitignore
index aec0bad..c2d1277 100644
--- a/ltdl/.gitignore
+++ b/ltdl/.gitignore
@@ -21,6 +21,7 @@ lt*.c
lt*.h
Makefile.am
Makefile.in
+Makefile.inc
Makefile
README
slist.c
hooks/post-receive
--
GNU M4 source repository
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU M4 source repository branch, master, updated. cvs-readonly-52-g410176a,
Eric Blake <=