[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-34-gbba5b84
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-34-gbba5b84 |
|
Date: |
Thu, 27 Oct 2011 03:27:59 +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 Libtool".
The branch, master has been updated
via bba5b84fcd05fe4872b0228104b7be9b7de8daba (commit)
via 4008119bcc321096bde69d3e81a4d6af76e5c7b9 (commit)
via a7d34118b2e87f724b4801db8cf0ed5e9b13fc79 (commit)
from 166da4d2a269b101bda8022f0a44f9c3e7ae56f9 (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 bba5b84fcd05fe4872b0228104b7be9b7de8daba
Author: Gary V. Vaughan <address@hidden>
Date: Sat Oct 22 16:46:31 2011 +0700
maint: use gnulib's gitlog-to-changelog instead of a ChangeLog file.
* ChangeLog: Removed.
* HACKING (Editing 'ChangeLog'): Removed. Renumbered other sections to
compensate.
* bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
* Makefile.am (ChangeLog): Generate the ChangeLog for 2011...
(dist-hook): ...from the output of `git log' before rolling a
distribution tarball.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 4008119bcc321096bde69d3e81a4d6af76e5c7b9
Author: Gary V. Vaughan <address@hidden>
Date: Thu Oct 20 22:17:23 2011 +0700
maint: use gnulib's git-version-gen instead of mkstamp.
* libltdl/config/mkstamp: File removed.
* bootstrap.conf (gnulib_modules): Add git-version-gen.
* configure.ac (AC_INIT, package_revision): Use git-version-gen to
calculate version number.
(TIMESTAMP): Removed.
* libtoolize.m4sh, libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4
(TIMESTAMP): Ditto.
* Makefile.am (TIMESTAMP): Ditto.
(MKSTAMP): Renamed from this...
(git_version_gen): ...to this. Set revision here. An alpha is now a
release with an odd micro relase number.
(rebuild): Don't reset revision here.
(build_scripts): Remove mkstamp, add git-version-gen.
(EXTRA_DIST, BUILT_SOURCES): Add .version.
(libltdl/config/ltmain.sh, libltdl/m4/ltversion.m4, tests/package.m4):
Don't depend on configure.ac or ChangeLog to determine when the
version number has reved, use .version directly.
(.version): Flush most recent configure calculated VERSION to disk.
(dist-hook): Flush current VERSION to disk at dist time.
(dotserial): Distributed file to cache the serial number for
when git is not available to recalculate it when building from a
release tarball.
(dist-hook): Make sure .serial is created.
(libltdl/config/ltversion.m4): Use .serial when it is present
(in a dist tarball) or calculate with git otherwise (in a git
working directory).
(EXTRA_DIST): Add .serial file.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit a7d34118b2e87f724b4801db8cf0ed5e9b13fc79
Author: Gary V. Vaughan <address@hidden>
Date: Tue Oct 18 23:24:53 2011 +0700
maint: use gnulib's maint.mk and support scripts release procedure.
* Makefile.maint: Removed.
* configure.ac (LASTRELEASE, lt_major, lt_minor, lt_micro, lt_alpha):
All removed. Makefile.maint was the only client.
* HACKING (Release Procedure): Removed.
* bootstrap.conf (gnulib_modules): Add announce-gen,
do-release-commit-and-tag, gendocs, gnu-web-doc-update, gnupload and
readme-release.
* cfg.mk (manual_title): Set it for web-manual rule.
(announcement_Cc_): Release announcement email addresses.
* Makefile.am (build_scripts): Add to EXTRA_DIST additional files
imported from gnulib for maint.mk release procedure.
* NEWS: Updated.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +
.prev-version | 1 +
ChangeLog | 437 -----------------------
HACKING | 404 +--------------------
Makefile.am | 105 ++++--
Makefile.maint | 206 -----------
NEWS | 8 +-
bootstrap.conf | 51 +++-
cfg.mk | 11 +-
configure.ac | 74 +----
doc/.gitignore | 1 +
gl/build-aux/announce-gen.diff | 39 ++
gl/build-aux/do-release-commit-and-tag.diff | 22 ++
gl/top/README-release.diff | 38 ++
libltdl/config/.gitignore | 6 +
libltdl/config/cvsu | 512 +++++++++++++++++++++++++++
libltdl/config/ltmain.m4sh | 19 +-
libltdl/config/mkstamp | 48 ---
libltdl/m4/libtool.m4 | 3 +-
libtoolize.m4sh | 4 +-
20 files changed, 790 insertions(+), 1203 deletions(-)
create mode 100644 .prev-version
delete mode 100644 ChangeLog
delete mode 100644 Makefile.maint
create mode 100644 gl/build-aux/announce-gen.diff
create mode 100644 gl/build-aux/do-release-commit-and-tag.diff
create mode 100644 gl/top/README-release.diff
create mode 100755 libltdl/config/cvsu
delete mode 100755 libltdl/config/mkstamp
diff --git a/.gitignore b/.gitignore
index 87096df..f337328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,9 +33,12 @@
.libs
/.pc
/.sc-start*
+/.version
/COPYING
+/ChangeLog
/GNUmakefile
/INSTALL
+/README-release
/gnulib-local
/libtoolize
/libtoolize.in
@@ -67,3 +70,4 @@ testdir*
testsuite
testsuite.dir
testsuite.log
+vc-diffs
diff --git a/.prev-version b/.prev-version
new file mode 100644
index 0000000..8e8299d
--- /dev/null
+++ b/.prev-version
@@ -0,0 +1 @@
+2.4.2
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index bfd6fab..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,437 +0,0 @@
-2011-10-24 Gary V. Vaughan <address@hidden>
-
- tests: ensure VPATH autom4te search path can find autotests.
- * Makefile.am (tests/testsuite): Passing only $(srcdir) include path
- to autom4te is unable to find tests/package.m4, and passing only
- $(srcdir)/tests breaks VPATH build searches for TESTSUITE_AT files,
- which are relative to $(srcdir)... so we pass both!
- * NEWS: Updated.
- Reported by Bob Friesenhahn.
-
-2011-10-24 Karl Berry <address@hidden>
-
- doc: modernize libtool.texi.
- * libtool.texi (@copying): Use this instead of @ifnottex; format for
- Texinfo; eliminate obsolete paragraph about TeX; use @insertcopying
- instead of duplicating text.
- (@syncodeindex): Move all to the Texinfo header, where they belong.
- (@dircategory): Use "Software development" instead of "GNU programming
- tools", for consistency; and align individual entries to avoid
- multiple lines; and move to after the copyright message.
-
-2011-10-19 Gary V. Vaughan <address@hidden>
-
- maint: use gnulib's maintainer-makefile module.
- * bootstrap.conf (gnulib_modules): Add maintainer-makefile.
- (gnulib_tool_options): Add --avoid=dummy now that we have a real
- module to import.
- * cfg.mk: New file. Customize maint.mk for Libtool.
- * Makefile.am (EXTRA_DIST): Add GNUmakefile, cfg.mk and maint.mk.
-
-2011-10-19 Gary V. Vaughan <address@hidden>
-
- maint: use gnulib's canonical fdl.texi.
- * doc/fdl.texi: Removed.
- * bootstrap.conf (gnulib_non_module_files): Add fdl.texi.
-
-2011-10-18 Gary V. Vaughan <address@hidden>
-
- maint: use gnulib's canonical COPYING files.
- * COPYING, libltdl/COPYING.LIB: Removed.
- * bootstrap.conf (gnulib_non_module_files): Add COPYING.
- (libtool_add_libltdl_copying): New func_gnulib_tool hook
- function to copy the canonical LGPL2 COPYING file from gnulib at
- bootstrap.
-
-2010-09-16 Gary V. Vaughan <address@hidden>
-
- maint: use gnulib's (pending saner) bootstrap script.
- * bootstrap: Replaced with gnulib script.
- * bootstrap.conf: New file with Libtool specific bootstrap
- configuration.
- * Makefile.am (EXTRA_DIST): Add bootstrap.conf.
-
-2010-08-27 Gary V. Vaughan <address@hidden>
-
- maint: add gnulib submodule.
- * configure.ac (GL_INIT, GL_EARLY): Initialise gnulib, and expand
- its configure time checks.
- * .gitmodules (gnulib): New file with configuration for our
- gnulib git submodule.
-
-2010-09-01 Gary V. Vaughan <address@hidden>
-
- maint: don't run help2man on programs not-yet-built.
- * Makefile.am (doc/libtool.1, doc/libtoolize.1): Added a
- comment about why the dependencies here have to be a mite
- bizarre.
-
-2010-09-26 Gary V. Vaughan <address@hidden>
-
- tests: remove unused `aux_dir' variable from `getopt-m4sh.test'.
- * tests/getopt-m4sh.at (aux_dir): Remove unused variable.
-
-2010-09-26 Gary V. Vaughan <address@hidden>
-
- tests: DRYing out `tests/sh.test'.
- * Makefile.am (libtool_m4): Canonical location of libtool.m4 file.
- (lt_aclocal_m4_deps): Use it.
-
-2010-09-23 Gary V. Vaughan <address@hidden>
-
- maint: pass directory declarations in configure.ac into Makefile.
- * configure.ac (AC_CONFIG_AUX_DIR, LT_CONFIG_LTDL_DIR)
- (AC_CONFIG_MACRO_DIR): Append code to these functions to
- capture and propagate their directory arguments to Makefile.
- * Makefile.am (aux_dir, ltdl_dir, macro_dir): Remove declarations.
- * bootstrap (my_sed_trace): Also capture LT_CONFIG_LTDL_DIR into
- `$ltdl_dir'.
- <Makefile>: Output the extracted values of `aux_dir', `ltdl_dir'
- and `macro_dir' at the top of the quick'n'dirty bootstrap
- Makefile.
-
-2010-09-26 Gary V. Vaughan <address@hidden>
-
- maint: factor out ltmain.sh variable deletion.
- * Makefile.am (ltmain_sh_edit): Expand upon bootstrap edit by
- adding the extra line to delete boilerplate variable settings
- from libltdl/config/general.m4sh that don't apply here.
- (libltdl/config/ltmain.sh): Use it.
-
-2010-09-25 Gary V. Vaughan <address@hidden>
-
- maint: DRYing out `Makefile.am' file paths.
- * Makefile.am (aux_dir, macro_dir): Include `$(srcdir)' in
- declaration. Adjust all references.
- (doc_dir, ltdl_dir, m4sh_dir, tests_dir): New single location
- to hold directory paths, all including `$(srcdir)', to reduce
- typing.
- (LT_M4SH): Use `$m4sh_dir' as include directory.
- (defs): This one is for a file in the build-tree, so no
- leading `$(srcdir)'.
-
-2010-09-25 Gary V. Vaughan <address@hidden>
-
- CLEANUP: fix error from pushing too far up the branch.
- * Makefile.am (install-data-local): Undo character transposition
- from too early push of untested v2.4-17-gaf74d58.
-
-2010-09-23 Gary V. Vaughan <address@hidden>
-
- maint: use macro_dir consistently in all files.
- * Makefile.am: Replace all uses of m4dir with macrodir to
- match AC_CONFIG_MACRO_DIR.
- * libltdl/config/libtoolize.m4sh: Replace all uses of macrodir
- with macro_dir.
- * tests/defs.m4sh, tests/sh.test: Likewise.
-
- maint: use aux_dir consistently in all files.
- * Makefile.am, Makefile.maint: Replace all uses of auxdir
- with aux_dir to match AC_CONFIG_AUX_DIR.
- * libltdl/config/libtoolize.m4sh: Likewise.
- * tests/defs.m4sh, tests/getopt-m4sh.at: Likewise.
-
-2010-09-24 Gary V. Vaughan <address@hidden>
-
- Makefile: try to be robust against shell meta-chars in filenames.
- * Makefile.am: In each rule body, unless a make variable needs
- to be seen as multiple words by the shell (for word-splitting
- loops, or because it contains several commands), quote it. Use
- single quotes unless the shell needs to perform variable inter-
- polation, in which case use double quotes.
-
-2010-09-24 Gary V. Vaughan <address@hidden>
-
- maint: let make employ user's `SED' setting.
- * Makefile.am: Replace hard-coded `sed' with `$(SED)' through-
- out.
-
-2010-08-30 Gary V. Vaughan <address@hidden>
-
- maint: simplify and improve safety of bootstrap process.
- * Makefile.am (bootstrap_files): List files that need to be
- generated at bootstrap time before `./configure && make' can
- work. It turns out that this is considerably fewer files than we
- had thought necessary previously.
- (bootstrap-deps-prep): Ensure minimum set of required substitution
- variables are non-empty.
- (bootstrap-deps): Depend on `bootstrap' files.
- * bootstrap (Generate bootstrap dependencies): Now that
- `Makefile.am' is entirely responsible for rebuilding files at
- bootstrap time, we need only specify the new `bootstrap-deps'
- target, and supply values for the substitutions checked by
- `bootstrap-deps-prep'.
- * configure.ac (AC_CONFIG_SRCDIR): `libtoolize.in' is not here yet
- right after running `bootstrap'. So rely on the presence of
- `libtoolize.m4sh', which is always there.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: eliminate superfluous temporary files from `Makefile.am'.
- * Makefile.am (CLEANFILES): Remove temporary file entries.
- (libtoolize.in, libltdl/config/ltmain.sh, libltdl/m4/ltversion.m4)
- (tests/defs, tests/testsuite): Factor away temporary files.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: eliminate `ltmain.in' and `libtoolize.in' intermediate files.
- * Makefile.am (libltdl/config/ltmain.sh, libtoolize.in): Pipe
- the output of `$(LT_M4SH)' directly into `$(bootstrap_edit)' to
- avoid use of superfluous intermediate file.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: don't hardcode repeated long paths in Makefile rules.
- According to the DRY principle, scattering several copies of
- something across a file or project leads to pain. Let's not
- do that!
- * Makefile.am (Makefile_in, Makefile_inc, defs_in, defs_m4sh),
- (libtoolize_in, ltmain_m4sh, ltversion_in): New variables to
- hold the location of important files and targets.
- (EXTRA_DIST): Add the distributed ones by variable.
- (libtoolize, libltdl/Makefile.am, libltdl/m4/ltversion.m4)
- (libltdl/config/ltmain.sh, libltdl/stamp-mk, tests/defs)
- (tests/defs.in): Use the new variables to reduce noise and
- repetition.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: make better use of automatic variables in `Makefile.am'.
- * Makefile.am (libtoolize, libtoolize.in, libltdl/Makefile.am)
- (libltdl/config/mkstamp, libltdl/config/ltmain.m4sh)
- (libltdl/m4/ltversion.m4, tests/testsuite, tests/defs.in):
- Make better use of automatic variables.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: name temporary files in `Makefile.am' consistently.
- Sadly, we still have to jump through hoops for MICROS~1's very
- old, very broken 8.3 naming convention, so we have to be careful
- to be unique in the first 8 letters, and not to use two periods
- in a filename, otherwise we could use the much more elegent
- `temporary files use "address@hidden"' idiom:
- * Makefile.am (libltdl/m4/ltversion.m4): Rename temporary file
- to `ltversion.tmp'.
- (libltdl/config/ltmain.sh): Rename temporary file to
- `libltdl/config/ltmain.tmp'.
- (libtoolize): Rename temporary file to `libtoolize.tmp'.
- (tests/defs): Rename temporary file to `tests/defs.tmp'
- (tests/testsuite): Rename temporary file to `tests/testsuite.tmp'.
- (CLEANFILES): Append temporary files as we create rules that
- use them.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: factor Makefile.am `m4sh' invocations to LT_M4SH.
- * Makefile.am (LT_M4SH): Now that all directories are listed as
- fully qualified paths, the search path argument to M4SH is always
- the same, so factor it out into a variable. Adjust all callers.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: avoid unnecessary directory changes in Makefile rules.
- * Makefile.am (doc/notes.txt, libltdl/m4/ltversion.m4,
- (libltdl/config/ltmain.m4sh, libtoolize.in, libltdl/Makefile.am)
- (libltdl/config/mkstamp, tests/testsuite, tests/defs.in): Avoid
- unnecessary `cd' commands by using fully qualified paths to files
- outside of current directory.
-
-2010-08-31 Gary V. Vaughan <address@hidden>
-
- build: compare `revision' rather than `correctver' in Makefile.am.
- * Makefile.am (rebuild): Set the shell variable `revision' rather
- than `correctver' for clarity of purpose.
- (bootstrap_edit, libltdl/config/ltmain.sh): Adjust.
- (libltdl/m4/ltversion.m4): Likewise, and alse, instead of munging
- the serial number comment line with set, extract `macro_version'
- from this file, and compare it directly with `revision'.
- (libtool): Likewise for `package_revision'.
-
-2010-10-20 Gary V. Vaughan <address@hidden>
-
- build: avoid spurious bootstrap_edit call.
- * Makefile.am (tests/package.m4): @FOO@ substitutions have already
- been made by the time Makefile.am has been transformed into Makefile,
- so don't try to rerun the substitutions manually with
- $(bootstrap_edit) after the fact.
-
-2011-10-17 Gary V. Vaughan <address@hidden>
-
- Post-release administrivia.
- * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
- numbers.
- * NEWS: Add header line for next release.
-
- Release 2.4.2.
- * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
- numbers.
- * NEWS: Update version number.
-
- Replace leading spaces with tabs.
- * libltdl/m4/libtool.m4, libltdl/config/ltmain.m4sh: Replace leading
- spaces in soure code with tabs to match surrounding code.
- Reported by Peter Rosin.
-
- Make a note to use gnu/linux for version_type.
- * libltdl/m4/libtool.m4 (version_type): Add a comment to change
- version_type setting from 'linux' to 'gnu/linux' during the next
- destabilising code refactoring.
- * libltdl/config/ltmain.m4sh: ditto.
- Requested by Richard Stallman.
-
-2011-10-04 Bart Van Assche <address@hidden>
-
- Typo fix - change func_apped into func_append
- * libltdl/config/ltmain.m4sh: Fix typo.
-
-2011-10-02 Xin LI <address@hidden>
-
- Avoid problems when FreeBSD goes to version 10.
- * libltdl/m4/libtool.m4: Remove mentions of freebsd1. Use dots
- for FreeBSD 2 and 3 detection to avoid future problems
- * libltdl/m4/ltmain.m4sh: ditto.
-
-2011-09-25 Cristophe Jarry <address@hidden>
-
- Avoid mentioning "Linux", use "GNU/Linux", if appropriate.
- * TODO: Don't use bare "Linux".
- * doc/libtool.texi: ditto.
- * doc/notes.texi: ditto.
- * libltdl/README: ditto.
- * libltdl/m4/libtool.m4: ditto.
-
-2011-09-01 Peter O'Gorman <address@hidden>
-
- Add flag to inhibit warnings.
- * libltdl/config/ltmain.m4sh: Add --no-warn, --no-warning flags.
- Reported by John Davd Anglin.
-
-2011-04-10 Kurt Roeckx <address@hidden>
-
- tagdemo: do not rely on picking up symbols from indirect deps.
- * tests/tagdemo/Makefile.am: Link to all libraries that the
- demo application uses.
-
-2011-04-10 Svante Signell <address@hidden> (tiny change)
-
- Set shlibpath_overrides_runpath for the Hurd.
- * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [gnu]
- <shlibpath_overrides_runpath>: Set to no.
- * THANKS: Update.
-
-2011-03-22 Justin Lecher <address@hidden> (tiny change)
- Rhys Ulerich <address@hidden> (tiny change)
-
- Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines.
- * libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP
- flags like pthreads flags.
-
-2011-03-14 Ralf Wildenhues <address@hidden>
-
- libtoolize: detect -I<dir> (without space) in ACLOCAL_AMFLAGS.
- * libtoolize.m4sh (func_scan_files): Also accept -I<dir>
- (without intervening space) in ACLOCAL_AMFLAGS.
- * THANKS: Update.
- Report from Jan Engelhardt.
-
-2011-03-04 Peter O'Gorman <address@hidden>
-
- On Mac OS X try .dylib as well as .so with lt_dlopenext
- * libltdl/m4/ltdl.m4: Define extra extension if module extension
- differs from shared lib extension.
- * libltdl/ltdl.c: Use it.
- * tests/darwin.at: Test it.
- * NEWS: Announce it.
- Reported by Hans Aberg, Michael Ellis, and others.
-
-2011-02-12 Peter O'Gorman <address@hidden>
-
- Install ltmain.sh without execute bit set.
- * Makefile.am: change install rule for ltmain.sh
- Reported by KÅiÅ¡tof Želechovski.
-
-2011-02-07 Ralf Wildenhues <address@hidden>
-
- docs: fix copyright years in PDF version of the manual.
- * doc/libtool.texi: Fix copyright years.
-
-2011-02-01 Rainer Orth <address@hidden> (tiny change)
-
- Fix LD setting for 64-bit Solaris 2/x86.
- * libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK) [*-*-solaris*]:
- Determine GNU ld options for 64-bit Solaris 2/x86. Detect gld
- 2.21 _sol2 emulations.
-
-2011-01-27 Peter O'Gorman <address@hidden>
-
- Don't loop through wrapper script arguments unnecessarily.
- * libltdl/m4/ltmain.m4sh: Check that argv contains " --lt-"
- before looping to remove wrapper script targetted arguments.
- Performance regression reported by Dan McGee.
-
-2011-01-20 Gerald Pfeifer <address@hidden> (tiny change)
-
- Remove support for FreeBSD 1.x.
- * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS)
- (_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which
- soon would incorrectly match FreeBSD 10.0.
- * NEWS, THANKS: Update.
-
-2011-01-19 Peter O'Gorman <address@hidden>
-
- Don't let verbose linker messages influence test results.
- * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Ignore
- stderr during tests for -flag unless it contains "flag".
- * tests/darwin.at: Add test.
- Reported by Jeremy Huddleston and also by David Fang.
-
-2011-01-09 John David Anglin <address@hidden> (tiny change)
-
- Fix relink mode to use absolute path if hardcode_minus_L.
- * libltdl/config/ltmain.m4sh (func_mode_link): Use absolute path
- when hardcoding with -L.
-
-2011-01-09 Ralf Wildenhues <address@hidden>
-
- Fix $wl setting for Solaris Studio 12.2 f90 on GNU/Linux.
- * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) [linux]
- <lt_prog_compiler_wl>: Set to '-Qoption ld ' if we
- detect Sun Fortran version 8.4 or newer.
- Report by Terry Dontje.
-
-2011-01-07 Peter Rosin <address@hidden>
-
- Convert file name to toolchain format when blessing archives.
- * libltdl/config/ltmain.m4sh (func_mode_install): When executing
- old_postinstall_cmds and old_archive_cmds, convert $oldlib to a
- format appropriate for the tool and provide that in $tool_oldlib.
- Also use $tool_oldlib when stripping old libraries.
- * libltdl/m4/libtool.m4 (_LT_CMD_OLD_ARCHIVE): Use $tool_oldlib
- as argument to $RANLIB.
- * THANKS: Update.
- Report by Dan McMahill.
-
-2011-01-02 Ralf Wildenhues <address@hidden>
-
- Bump copyright years.
- * ChangeLog.2010: New, rotated from ...
- * ChangeLog: ... here.
- * Makefile.am (EXTRA_DIST): Add ChangeLog.2010.
- * NEWS, libltdl/config/ltmain.m4sh: Bump copyright years.
- * libltdl/m4/libtool.m4 (_LT_COPYING, LT_OUTPUT): Likewise.
- * libtoolize.m4sh: Likewise.
- * doc/libtool.texi: Likewise.
-
-Continued in ChangeLog.2010
---
- Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-
- This file is part of GNU Libtool.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-vim:tw=72
diff --git a/HACKING b/HACKING
index b17de29..21a810b 100644
--- a/HACKING
+++ b/HACKING
@@ -15,9 +15,9 @@ and is not part of a release distribution.
appropriate paperwork, and be sure to add their name and email
address to THANKS
-* If a change fixes a test, mention the test in the ChangeLog entry.
+* If a change fixes a test, mention the test in the git log entry.
-* If somebody reports a new bug, mention his name in the ChangeLog entry
+* If somebody reports a new bug, mention his name in the git log entry
and in the test case you write.
* The correct response to most actual bugs is to write a new test case
@@ -41,10 +41,9 @@ and is not part of a release distribution.
+ mdate-sh
+ missing
+ texinfo.tex
- The ones that are important for a release can be udated with,
- `make -fMakefile.maint fetch' (or `make -f../Makefile.maint fetch'
- if you are running from a VPATH build directory, where `../' is the
- relative path to the directory with `configure' in it).
+ The ones that are important for a release can be updated by ensuring
+ gnulib is up-to-date, and running `bootstrap` to recheck the links are
+ correct.
* Changes other than bug fixes must be mentioned in NEWS
@@ -90,112 +89,7 @@ and is not part of a release distribution.
with the `_lt_' macro namespace).
-5. Editing 'ChangeLog'
-======================
-
-* When in doubt, check that emacs can syntax-color properly in
- change-log-mode. And preferably use emacs 'C-x 4 a'
- (add-change-log-entry-other-window) to open ChangeLog with an
- appropriate new template.
-
-* If this change is by a different author, or on a different date to the
- last entry start a new entry at the top of the file with the format
- (note two spaces between each field):
-
-yyyy-mm-dd Name of Author <address@hidden>
-
-* If more than one person collaborated on the change, additional
- authors can be listed on subsequent lines, thus:
-
-yyyy-mm-dd Name of Main Author <address@hidden>,
- Name of Contributor <address@hidden>
-
-* Where a change author did not supply a copyright assignment, but the
- changes they submitted were sufficiently trivial to commit in any case
- (see the GCS for guidelines on this), then flag this against their
- name in the header, thus:
-
-yyyy-mm-dd Name of Author <address@hidden> (tiny change)
-
-* In ChangeLog.2004 and earlier, 'Name of Author' was sometimes the name
- of the author of the ChangeLog when the person who made the change
- being documented didn't supply one. In that case separated from
- the previous field by a blank line and indented by 1 tab (note, only
- 1 space between fields here) you will see:
-
- From Author of Actual Change <address@hidden>:
-
- As of now, don't do that anymore, since the GNU Coding Standards say
- that the author of the change must be credited in the main entry
- header for legal purposes.
-
-* Preferably the next part should be a description of the overall
- purpose of the change, separated from the header by a blank line,
- indented by 1 tab, and filled at column 72. The last character of the
- description should be a period. Ideally, this description fits on one
- line, or begins with a one-line summary.
-
-* Changes to each file come next. Each new file starts on a new line,
- indented by 1 tab and starting with an asterisk and a space. Multiple
- files can be listed here relative to $top_srcdir, and comma separated.
- Names of functions (or sections as appropriate) to which the change
- applies should be named inside parentheses and comma separated. If
- this goes beyond column 72, then parens should be closed and re-opened
- on the next line:
-
- * file, another/file, test/testcases/foo.test (func_foo)
- (func_bar, func_baz): Description of changes.
-
-* If the change does not apply to particular functions (or sections),
- the section list can be omitted:
-
- * file, another/file, test/testcases/foo.test: General changes.
-
-* If the changes are particular to certain architectures, they should be
- listed after the functions in square brackets:
-
- * file, another/file (func_foo) [linux, solaris]: Description of
- changes.
-
-* Subsequent changes in other files that are related to the same overall
- enhancement or bugfix should be listed concurrently, without blank
- lines. Always start a fresh line for a new file:
-
- * file, another/file (func_foo) [linux, solaris]: Description of
- changes.
- * doc/foo.texi (Invoking Foo): Document.
- * NEWS: Updated.
-
-* If the change is in response to a problem reported by someone other
- than the author, then credit them at the end of the description with:
-
- Reported by Reporter Name <address@hidden>.
-
-* See the GNU Coding Standards document for more details on ChangeLog
- formatting.
-
-
-2005-01-08 Ralf Wildenhues <address@hidden> (tiny change),
- Peter O'Gorman <address@hidden>
-
- This is the overall description of the purpose of this change
- and any useful background for a model ChangeLog entry.
-
- * HACKING: Updated copyright. This isn't attached to a
- particular section of the file, so it comes first.
- (Editing 'ChangeLog'): New section. This applies to the same
- file, but since it applies to a particular section it starts on
- a new line.
- (Introduction, Maintenance Notes, Test Suite, Naming)
- (Editing '.am' Files): If I had changed all these sections in
- the same way, I can list them like this, being careful to close
- and reopen the parentheses when starting a new line. The colon
- only comes after the last section before this description.
- * NEWS: Updated.
- Reported by Bob Friesenhahn <address@hidden>.
-
-
-6. Using git
+5. Using git
============
* Preferably, let the git commit message mirror the ChangeLog entry,
@@ -218,7 +112,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
a linear history.
-7. Editing `.am' Files
+6. Editing `.am' Files
======================
* Always use $(...) and not ${...}
@@ -244,7 +138,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
and will be fixed in the `libtoolize --ltdl --(non)recursive' stage.
-8. Editing `.m4sh' Files
+7. Editing `.m4sh' Files
========================
* Use shell functions, but be careful not to assume local scope for
@@ -287,7 +181,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
]])
-9. Editing `.m4' Files
+8. Editing `.m4' Files
======================
* Be careful with both `echo' and `$ECHO'. As the latter may be one of
@@ -313,7 +207,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
be updated in all newer versions.
-10. Abstraction layers in libltdl
+9. Abstraction layers in libltdl
=================================
* The libltdl API uses a layered approach to differentiate internal and
@@ -414,7 +308,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
loading: preopen.c, dlopen.c etc.
-11. Licensing Rules
+10. Licensing Rules
===================
GNU Libtool uses 3 different licenses for various of the files distributed
@@ -425,7 +319,7 @@ commenting (shell, C etc) and decoration (m4sh etc) assumed
throughout.
-11.1. Notice preservation
+10.1. Notice preservation
Autoconf macros and files used to generate them need this license, along
with files such as HACKING, NEWS, README, README.alpha, TODO and
@@ -441,7 +335,7 @@ without warranty of any kind.
-11.2. GPL
+10.2. GPL
Everything else in the distribution has the following license text
unless there is good reason to use one of the other license texts
@@ -470,7 +364,7 @@ or obtained by writing to the Free Software Foundation,
Inc.,
-11.3. GPL with self extracting version
+10.3. GPL with self extracting version
Some of the sources built atop the getopt.m4sh framework use
func_version() to extract their --version output from the copyright
@@ -504,7 +398,7 @@ or obtained by writing to the Free Software Foundation,
Inc.,
-11.4. GPL with self extracting version and Libtool exception clause
+10.4. GPL with self extracting version and Libtool exception clause
Although the libtool script is generated from `ltmain.m4sh' according
to the rules in the preceding subsection, it also needs the Libtool
@@ -543,7 +437,7 @@ or obtained by writing to the Free Software Foundation,
Inc.,
-11.5. LGPL with Libtool exception clause
+10.5. LGPL with Libtool exception clause
Finally, not only is Libltdl is LGPLed, but it is routinely
redistributed inside projects that use it, so its sources need to use
@@ -577,272 +471,6 @@ copy can be downloaded from
http://www.gnu.org/licenses/lgpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-12. Release Procedure
-=====================
-
-* If you are a libtool maintainer, but have not yet registered your
- gpg public key and (preferred) email address with the FSF, send an
- email, preferably GPG-signed, to <address@hidden> that includes
- the following:
-
- (a) name of package(s) that you are the maintainer for, and your
- preferred email address.
-
- (b) an ASCII armored copy of your GnuPG key, as an attachment.
- ("gpg --export -a YOUR_KEY_ID > mykey.asc" should give you
- this.)
-
- When you have received acknowledgement of your message, the proper GPG
- keys will be registered on ftp-upload.gnu.org and only then will you be
- authorized to upload files to the FSF ftp machines.
-
-* If you do not have access to the mailing list administrative interface,
- approach the list owners for the password. Be sure to check the lists
- (esp. bug-libtool) for outstanding bug reports also in the list of
- pending moderation requests.
-
-* Make sure you have wget and xz installed.
-
-* Make sure your locale is sane, e.g. by exporting LC_ALL=C.
-
-* Double check that serial number updates in public m4 files weren't forgotten
- since last release (they should be updated in git along with commits that
- require it so that users can work with git snapshots).
-
-* Update the LTDL_VERSION_INFO in libltdl/Makefile.inc for changes since
- the last release.
-
-* Update the version number in configure.ac and libltdl/configure.ac.
- See http://www.gnu.org/software/libtool/contribute.html for details of
- the numbering scheme.
-
-* Update NEWS, ChangeLog.
-
-* Run ./bootstrap.
-
-* Run ./configure (or create a build directory first and run configure
- from there, if you want to keep the build tree separate).
-
-* Run `make -fMakefile.maint fetch' (or `make -f../Makefile.maint fetch'
- if you are running from a VPATH build directory, where `../' is the
- relative path to the directory with `configure' in it), which will
- fetch new versions of the files that are maintained outside of
- libtool.
-
-* Run `make distcheck'
- and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'
- and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g'
- and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-shared'
- and `make distcheck CC=g++'
- If there are any problems, fix them and start again.
-
-* Run `git commit' from the source tree.
-
-* Run `make -fMakefile.maint git-dist' (or `make -f../Makefile.maint
- git-dist' if you are running from a VPATH build directory, where `../'
- is the relative path to the directory with `configure' in it), which
- will build a release tarball (with `make distcheck'), tag the tree
- with release-$(VERSION) and generate the gpg signature files.
-
-* Run 'make -f[../]Makefile.maint diffs' (pass
- LASTRELEASE=maj.min[.mic[alpha]] if needed) to create diff files
- between the previous release tarball and the new with detached gpg
- signature files and clear signed directive files.
-
-* If not an alpha, generate with `make -f[../]Makefile.maint
- web-manual'.
-
-* Upload release tarballs and diff files, plus their associated
- detached gpg signature files and clear signed directive files to
- ftp-upload.gnu.org. If the upload is destined for ftp.gnu.org, then the
- files should be placed in the /incoming/ftp directory. If the upload is
- an alpha release destined for alpha.gnu.org, then the files should be
- placed in the /incoming/alpha directory.
-
-* Update version number in configure.ac and libltdl/configure.ac to next
- alpha number. See http://www.gnu.org/software/libtool/contribute.html
- for details of the numbering scheme.
-
-* Update NEWS, ChangeLog.
-
-* Run `git commit'.
-
-* Run `git push --tags', to push the new changes and tags to origin.
-
-* Update the webpages, libtool.html will need to indicate the latest
- release number.
-
-* If not an alpha, upload new manual pages you created earlier in
- doc/manual using cvs to here:
- <yourusername>@cvs.savannah.gnu.org:/webcvs/libtool
-
-* Write a release announcement, and post it to address@hidden' and
- address@hidden' with the Reply-To header set to
- address@hidden'. Stable releases should also be announced
- on address@hidden'.
-
-* Post a copy of your release announcement to savannah news:
- https://savannah.gnu.org/news/submit.php?group=libtool
- which will automatically propogate to http://planet.gnu.org.
-
-
-13. Alpha release note template
-===============================
-
-To: address@hidden, address@hidden
-Reply-To: address@hidden
-Subject: GNU Libtool @VERSION@ released (alpha release).
-
-The Libtool Team is pleased to announce alpha release @VERSION@ of GNU
-Libtool.
-
-GNU Libtool hides the complexity of using shared libraries behind a
-consistent, portable interface. GNU Libtool ships with GNU libltdl,
-which hides the complexity of loading dynamic runtime libraries
-(modules) behind a consistent, portable interface.
-
-Here are the compressed sources:
-
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@.tar.gz
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@.tar.bz2
-
-Here are the xdeltas and diffs against address@hidden@:
-
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@address@hidden@.diff.gz
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@address@hidden@.xdelta
-
-Here are the gpg detached signatures:
-
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@.tar.gz.sig
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@.tar.bz2.sig
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@address@hidden@.diff.gz.sig
- ftp://alpha.gnu.org/gnu/libtool/address@hidden@address@hidden@.xdelta.sig
-
-You should download the signature named after any tarball you download,
-and then verify its integrity with, for example:
-
- gpg --verify address@hidden@.tar.gz.sig
-
-Here are the MD5 and SHA1 checksums:
-
- @MD5SUM@ address@hidden@.tar.gz
- @MD5SUM@ address@hidden@.tar.bz2
- @MD5SUM@ address@hidden@address@hidden@.diff.gz
- @MD5SUM@ address@hidden@address@hidden@.xdelta
- @SHA1SUM@ address@hidden@.tar.gz
- @SHA1SUM@ address@hidden@.tar.bz2
- @SHA1SUM@ address@hidden@address@hidden@.diff.gz
- @SHA1SUM@ address@hidden@address@hidden@.xdelta
-
-This release has @address@hidden
-
-This release was bootstrapped with @BOOTSTRAP_TOOLS_WITH_VERSIONS@,
-but is useable with @COMPATIBLE_AUTOTOOL_VERSIONS@ in your own
-projects.
-
-Alternatively, you can fetch the unbootstrapped source code with
-git by using the following command:
-
- $ git clone git://git.savannah.gnu.org/libtool.git
- $ cd libtool
- $ git checkout @GIT_RELEASE_TAG@
-
-You will then need to have recent (possibly as yet unreleased) versions
-of Automake and Autoconf installed to bootstrap the checked out
-sources yourself.
-
-New in @VERSION@: @RELEASE_DATE@
-
- @EXCERPT_FROM_NEWS_FILE@
-
-Please report bugs to <address@hidden>, along with the verbose
-output of any failed test groups, and the output from `./libtool --config.'
-The README file explains how to capture the verbose test output.
-
-
-
-14. Full release note template
-==============================
-
-To: address@hidden
-Cc: address@hidden, address@hidden
-Reply-To: address@hidden
-Subject: GNU Libtool @VERSION@ released.
-
-The Libtool Team is pleased to announce the release of GNU Libtool
address@hidden@.
-
-GNU Libtool hides the complexity of using shared libraries behind a
-consistent, portable interface. GNU Libtool ships with GNU libltdl,
-which hides the complexity of loading dynamic runtime libraries
-(modules) behind a consistent, portable interface.
-
-This release has @address@hidden
-
-New in @VERSION@: @RELEASE_DATE@
-
- @EXCERPT_FROM_NEWS_FILE@
-
address@hidden@ is available now from ftp.gnu.org, along with
-diffs and xdeltas against address@hidden@
-that are also available from ftp.gnu.org. Please
-use a mirror to reduce stress on the main gnu machine:
-
- http://www.gnu.org/order/ftp.html
-
-Here are the compressed sources:
-
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@.tar.gz
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@.tar.bz2
-
-Here are the xdeltas and diffs against address@hidden@:
-
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@address@hidden@.diff.gz
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@address@hidden@.xdelta
-
-Here are the gpg detached signatures:
-
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@.tar.gz.sig
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@.tar.bz2.sig
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@address@hidden@.diff.gz.sig
- ftp://ftp.gnu.org/gnu/libtool/address@hidden@address@hidden@.xdelta.sig
-
-You should download the signature named after any tarball you download,
-and then verify its integrity with, for example:
-
- gpg --verify address@hidden@.tar.gz.sig
-
-Here are the MD5 and SHA1 checksums:
-
- @MD5SUM@ address@hidden@.tar.gz
- @MD5SUM@ address@hidden@.tar.bz2
- @MD5SUM@ address@hidden@address@hidden@.diff.gz
- @MD5SUM@ address@hidden@address@hidden@.xdelta
- @SHA1SUM@ address@hidden@.tar.gz
- @SHA1SUM@ address@hidden@.tar.bz2
- @SHA1SUM@ address@hidden@address@hidden@.diff.gz
- @SHA1SUM@ address@hidden@address@hidden@.xdelta
-
-This release was bootstrapped with @BOOTSTRAP_TOOLS_WITH_VERSIONS@,
-but is useable with @COMPATIBLE_AUTOTOOL_VERSIONS@ in your own
-projects.
-
-Alternatively, you can fetch the unbootstrapped source code with
-git by using the following command:
-
- $ git clone git://git.savannah.gnu.org/libtool.git
- $ cd libtool
- $ git checkout @GIT_RELEASE_TAG@
-
-You will then need to have the latest release versions of Automake
-(@AUTOMAKE_VERSION@) and Autoconf (@AUTOCONF_VERSION@) installed to
-bootstrap the checked out sources yourself.
-
-Please report bugs to <address@hidden>, along with the verbose
-output of any failed test groups, and the output from `./libtool --config.'
-The README file explains how to capture the verbose test output.
-
--
Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Free Software
Foundation, Inc.
diff --git a/Makefile.am b/Makefile.am
index 3df4751..38582ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,15 +51,8 @@ LT_M4SH = $(M4SH) -B '$(m4sh_dir)'
# Using `cd' in backquotes may print the directory name, use this instead:
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-MKSTAMP = '$(SHELL)' '$(aux_dir)/mkstamp'
-
-timestamp = set dummy `$(MKSTAMP) '$(srcdir)'`; shift; \
- case $(VERSION) in \
- *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2" ;; \
- *) TIMESTAMP="" ;; \
- esac
-
-rebuild = rebuild=:; $(timestamp); revision=$$1
+git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
+rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed
's,-.*$$,,g'`
# ---------- #
@@ -73,7 +66,13 @@ libtoolize_m4sh = $(srcdir)/libtoolize.m4sh
ltmain_m4sh = $(m4sh_dir)/ltmain.m4sh
sh_files = $(general_m4sh) $(getopt_m4sh)
-EXTRA_DIST += bootstrap bootstrap.conf cfg.mk maint.mk $(aux_dir)/mkstamp \
+build_scripts = $(aux_dir)/announce-gen $(aux_dir)/cvsu \
+ $(aux_dir)/do-release-commit-and-tag \
+ $(aux_dir)/gendocs.sh $(aux_dir)/git-version-gen \
+ $(aux_dir)/gnu-web-doc-update $(aux_dir)/gnupload \
+ $(aux_dir)/useless-if-before-free $(aux_dir)/vc-list-files
+
+EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \
$(sh_files) ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 \
ChangeLog.2003 ChangeLog.2004 ChangeLog.2005 ChangeLog.2006 \
@@ -113,7 +112,6 @@ bootstrap_edit = $(SED) \
-e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
-e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
-e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
- -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-e 's,@VERSION\@,$(VERSION),g'
## ltmain.sh needs some additional editing to remove unsubstituted
@@ -130,18 +128,22 @@ ltmain_sh_edit = $(bootstrap_edit) \
## We used to do this with a 'stamp-vcl' file, but non-gmake builds
## would rerun configure on every invocation, so now we manually
## check the version numbers from the build rule when necessary.
-$(ltversion_m4): $(ltversion_in) $(configure_ac) ChangeLog
+$(ltversion_m4): $(ltversion_in) $(dotversion)
@$(rebuild); \
if test -f '$@'; then \
eval `'$(SED)' -n '/^macro_revision=/p' '$@'`; \
test x"$$macro_revision" = x"$$revision" && rebuild=false; \
fi; \
for prereq in $?; do \
- case $$prereq in *ChangeLog | *configure.ac);; *) rebuild=:;; esac; \
+ case $$prereq in *.version);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
rm -f '$@'; \
- serial=`echo "$$revision" |$(SED) 's,^1[.],,g'`; \
+ if test -f '$(srcdir)/.serial'; then \
+ serial=`cat '$(srcdir)/.serial'`; \
+ else \
+ serial=`$(git_commit_count)`; \
+ fi; \
echo "$(bootstrap_edit) '$(ltversion_in)' > '$@'"; \
$(bootstrap_edit) '$(ltversion_in)' > '$@'; \
chmod a-w '$@'; \
@@ -157,14 +159,14 @@ $(ltversion_m4): $(ltversion_in) $(configure_ac) ChangeLog
## should make this rule depend on Makefile but that will break
## distcheck (at least) by rebuilding ltmain.sh in the source
## tree whenever config.status regenerates the Makefile.
-$(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(configure_ac) ChangeLog
+$(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
@$(rebuild); \
if test -f '$@'; then \
eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \
test x"$$package_revision" = x"$$revision" && rebuild=false; \
fi; \
for prereq in $?; do \
- case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
+ case $$prereq in *.version);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
rm -f '$@'; \
@@ -288,14 +290,14 @@ libtoolize: $(libtoolize_in) $(config_status)
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
# would rerun configure on every invocation, so now we manually
# check the version numbers from the build rule when necessary.
-libtool: $(ltmain_sh) $(config_status) ChangeLog
+libtool: $(ltmain_sh) $(config_status) $(dotversion)
@$(rebuild); \
if test -f '$@'; then \
eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \
test "$$package_revision" = "$$revision" && rebuild=false; \
fi; \
for prereq in $?; do \
- case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
+ case $$prereq in *.version);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
echo '$(SHELL) ./config.status "$@"'; \
@@ -371,6 +373,8 @@ libtoolize_1 = $(doc_dir)/libtoolize.1
notes_texi = $(doc_dir)/notes.texi
notes_txt = $(doc_dir)/notes.txt
+EXTRA_DIST += $(doc_dir)/gendocs_template
+
# A bug in automake 1.11.1 (at least) prevents us from using:
#
# info_TEXINFOS = $(doc_dir)/libtool.texi
@@ -482,9 +486,53 @@ install-data-local: $(lt_Makefile_in)
## Distribution. ##
## ------------- ##
-edit_readme_alpha = $(aux_dir)/edit-readme-alpha
+edit_readme_alpha = $(aux_dir)/edit-readme-alpha
+gitlog_to_changelog = $(aux_dir)/gitlog-to-changelog
+
+dotserial = $(distdir)/.serial
+dotversion = $(srcdir)/.version
+tarball_version = $(distdir)/.tarball-version
+readme = $(distdir)/README
+changelog = $(distdir)/ChangeLog
+
+# Generate ChangeLog for this year until it rotates out, when this start
+# date is updated to the following year.
+changelog_start_date = 2011-01-01
+$(changelog): FORCE
+ if test -d .git; then \
+ $(gitlog_to_changelog) --since=$(changelog_start_date) >
'address@hidden'; \
+ rm -f '$@'; mv 'address@hidden' '$@'; \
+ fi
+
+## Arrange so that .tarball-version appears only in the distribution
+## tarball, and never in a checked-out repository.
+EXTRA_DIST += $(dotversion)
+BUILT_SOURCES += $(dotversion)
+$(dotversion):
+ echo '$(VERSION)' > 'address@hidden' && mv 'address@hidden' '$@'
+## Edit the README file for alpha releases.
EXTRA_DIST += $(edit_readme_alpha)
+re_odd_version = '\([0-9][0-9]*.[0-9][0-9]*.[0-9]*[13579]\)'
+$(readme): FORCE
+ test -n `expr $(VERSION) : $(re_odd_version)` && \
+ $(SHELL) $(edit_readme_alpha) '$@'
+
+git_commit_count = git log --pretty=oneline |wc -l |$(SED) 's,[ ],,g'
+
+dist-hook: $(changelog) $(dotversion) $(readme)
+## Arrange so that .tarball-version appears only in the distribution
+## tarball, and never in a checked-out repository.
+ echo '$(VERSION)' > $(tarball_version)
+## ...and similarly for .serial.
+ $(git_commit_count) > $(dotserial)
+## Ensure aclocal has not wrongly picked up old macro definitions.
+ for macro in LT_INIT AC_PROG_LIBTOOL AM_PROG_LIBTOOL; do \
+ if grep "$$macro" '$(srcdir)/aclocal.m4' '$(lt_aclocal_m4)'; then \
+ echo "Bogus $$macro macro contents in an aclocal.m4 file." >&2; \
+ exit 1; \
+ else :; fi; \
+ done
uninstall-hook:
@$(NORMAL_UNINSTALL)
@@ -498,19 +546,6 @@ uninstall-hook:
rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
done
-dist-hook:
-## Edit the README file for alpha releases.
- case $(VERSION) in \
- *[a-z]) $(SHELL) $(edit_readme_alpha) $(distdir)/README ;; \
- esac
-## Ensure aclocal has not wrongly picked up old macro definitions.
- for macro in LT_INIT AC_PROG_LIBTOOL AM_PROG_LIBTOOL; do \
- if grep "$$macro" '$(srcdir)/aclocal.m4' '$(lt_aclocal_m4)'; then \
- echo "Bogus $$macro macro contents in an aclocal.m4 file." >&2; \
- exit 1; \
- else :; fi; \
- done
-
## ----------- ##
## Test suite. ##
@@ -621,7 +656,7 @@ INSTALLCHECK_ENVIRONMENT = \
$(testsuite): $(package_m4) $(TESTSUITE_AT) Makefile.am
$(AUTOTEST) -I '$(srcdir)' -I '$(srcdir)/tests' $(TESTSUITE_AT) -o '$@'
-$(package_m4): $(configure_ac) Makefile.am
+$(package_m4): $(dotversion) Makefile.am
{ \
echo '# Signature of the current package.'; \
echo 'm4_define([AT_PACKAGE_NAME], address@hidden@])'; \
@@ -1009,3 +1044,7 @@ fake-distclean-legacy:
$(TESTS): $(defs)
DISTCLEANFILES += $(defs)
+
+## An empty target to depend on when a rule needs to always run
+## whenever it is visited.
+FORCE:
diff --git a/Makefile.maint b/Makefile.maint
deleted file mode 100644
index 675e733..0000000
--- a/Makefile.maint
+++ /dev/null
@@ -1,206 +0,0 @@
-## Makefile.maint -- Makefile rules for libtool maintainers -*-Makefile-*-
-##
-## Copyright (C) 2004, 2005, 2010 Free Software Foundation, Inc.
-## Written by Scott James Remnant, 2004
-##
-## This file is part of GNU Libtool.
-##
-## GNU Libtool is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## GNU Libtool is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with GNU Libtool; see the file COPYING. If not, a copy
-## can be downloaded from http://www.gnu.org/licenses/gpl.html,
-## or obtained by writing to the Free ## Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#####
-
-# Need various variables defined by configure, a lot easier to just
-# include the Makefile than figure out a way to put them in here too
-include Makefile
-Makefile:
- @echo " *** Run maintainer rules from the build tree, with"
- @echo " *** \`make -f../Makefile.maint' for example, where"
- @echo " *** \`../' is the relative path back to the directory"
- @echo " *** that contains the \`Makefile.maint'. Alternatively,"
- @echo " *** run \`./configure' in the source tree for an in"
- @echo " *** tree build."
- @exit 1
-
-TEXI2HTML = texi2html
-
-.PHONY: git-release
-git-release: version-check prev-tarball check-news fetch git-dist diffs
web-manual
- @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \
- xzname="$(PACKAGE)-$(VERSION).tar.xz"; \
- diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
- echo " *** Upload $$tarname, $$tarname.sig,";\
- echo " *** $$tarname.directive.asc, $$xzname,";\
- echo " *** $$xzname.sig, $$xzname.directive.asc,";\
- echo " *** $$diffname, $$diffname.sig";\
- echo " *** and $$diffname.directive.asc to either"; \
- echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org."
- echo " *** You might need to upload manual.html to webcvs/libtool."
-
-.PHONY: version-check
-version-check:
- @case $(VERSION) in \
- *[acegikmoqsuwy]) \
- echo "Version \`$(VERSION)' is not a releasable version, please
read:"; \
- echo " http://www.gnu.org/software/libtool/contribute.html";; \
- exit 1; \
- ;; \
- esac
-
-GIT = git # set it to `:' to avoid git write operations
-
-.PHONY: check-commit
-check-commit:
- @if (cd $(srcdir) && test -d .git && \
- $(GIT) status | grep 'modified:'); then \
- echo "Cannot make git-dist before commit"; exit 1; else :; fi
-
-
-.PHONY: check-news
-check-news:
-## Make sure the NEWS file is up-to-date:
- @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" >/dev/null; \
- then :; \
- else \
- echo "NEWS not updated; not releasing" 1>&2; \
- exit 1; \
- fi
-
-## Program to use to fetch files.
-WGET = wget
-WGETSGO = $(WGET) 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~'
-WGET_GIT = $(WGET)
'http://git.savannah.gnu.org/gitweb/?a=blob_plain;hb=HEAD;p='
-WGET_CGIT = $(WGET) 'http://git.savannah.gnu.org/cgit/config.git/plain'
-
-## Files that we fetch and which we compare against.
-## FIXME should be a lot more here
-FETCHFILES = \
-./INSTALL \
-$(aux_dir)/compile \
-$(aux_dir)/install-sh \
-$(aux_dir)/config.guess \
-$(aux_dir)/config.sub \
-$(aux_dir)/texinfo.tex
-
-## Fetch the latest versions of files we care about.
-.PHONY: fetch
-fetch:
- rm -rf Fetchdir > /dev/null 2>&1
- mkdir Fetchdir
-## If a get fails then that is a problem.
- (cd Fetchdir && \
- $(WGET_GIT)'gnulib.git;f=doc/INSTALL' -O INSTALL && \
- $(WGET_GIT)'automake.git;f=lib/compile' -O compile && \
- $(WGET_GIT)'automake.git;f=lib/install-sh' -O install-sh && \
- $(WGET_CGIT)/config.guess -O config.guess && \
- $(WGET_CGIT)/config.sub -O config.sub && \
- $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex -O texinfo.tex )
-## Don't exit after test because we want to give as many errors as
-## possible.
- @stat=0; for file in $(FETCHFILES); do \
- fetchedfile=Fetchdir/`echo $$file | sed 's,.*/,,g'`; \
- if diff -u $(srcdir)/$$file $$fetchedfile \
- >>Fetchdir/update.patch 2>/dev/null; then :; \
- else \
- stat=1; \
- echo "Updating $(srcdir)/$$file..."; \
- cp $$fetchedfile $(srcdir)/$$file; \
- fi; \
- done; \
- test $$stat = 1 && \
- echo "See Fetchdir/update.patch for a log of the changes."; \
- exit $$stat
-
-
-GPG = gpg # set it to `:' to avoid gpg operations
-
-.PHONY: git-dist
-git-dist: check-news check-commit
-## Build the distribution:
- $(MAKE) distcheck
-## Finally, if everything was successful, tag the release
- cd $(srcdir) \
- && $(GIT) tag -s "v$(VERSION)"
-## Generate signatures and directives for FSF ftp-upload:
- for suffix in gz xz; do \
- ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
- $(GPG) --detach-sign $$ofile \
- && echo "version: 1.1" > $$ofile.directive \
- && echo "directory: libtool" >> $$ofile.directive \
- && echo "filename: $$ofile" >> $$ofile.directive \
- && $(GPG) --clearsign $$ofile.directive \
- && rm -f $$ofile.directive; \
- done
-
-.PHONY: prev-tarball
-prev-tarball:
-## Make sure we have the previous release tarball in the tree.
- @if test -z "$(LASTRELEASE)"; \
- then echo "LASTRELEASE is not set"; exit 1; fi
- @ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \
- if test -f $$ofile; then :; \
- else ofile="$(PACKAGE)-$(LASTRELEASE).tar.xz"; \
- if test -f $$ofile; then :; \
- else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
-
-.PHONY: new-tarball
-new-tarball:
-## Make sure we have the new release tarball in the tree.
- @ofile="$(PACKAGE)-$(VERSION).tar.gz"; \
- if test -f $$ofile; then :; \
- else ofile="$(PACKAGE)-$(VERSION).tar.xz"; \
- if test -f $$ofile; then :; \
- else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
-
-DIFF = diff
-DIFF_OPTIONS = -ruNp
-
-.PHONY: diffs
-diffs: prev-tarball new-tarball
-## Unpack the tarballs somewhere to diff them
- rm -rf delta-diff
- mkdir delta-diff
-
- cd delta-diff; \
- ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
- otar="../$(PACKAGE)-$(LASTRELEASE).tar"; \
- ntar="../$(PACKAGE)-$(VERSION).tar"; \
- test -f "$$otar.gz" && otar="$$otar.gz" && ounpack="gzip"; \
- test -f "$$ntar.gz" && ntar="$$ntar.gz" && nunpack="gzip"; \
- test -f "$$otar.xz" && otar="$$otar.xz" && ounpack="xz"; \
- test -f "$$ntar.xz" && ntar="$$ntar.xz" && nunpack="xz"; \
- $$ounpack -c -d "$$otar" | tar xf - \
- && $$nunpack -c -d "$$ntar" | tar xf - \
- && $(DIFF) $(DIFF_OPTIONS) \
- $(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \
- | GZIP=$(GZIP_ENV) gzip -c > $$ofile \
- && $(GPG) --detach-sign $$ofile \
- && echo "version: 1.1" > $$ofile.directive \
- && echo "directory: libtool" >> $$ofile.directive \
- && echo "filename: $$ofile" |sed 's,: \.\./,: ,' >> $$ofile.directive \
- && $(GPG) --clearsign $$ofile.directive \
- && rm -f $$ofile.directive
-
- rm -rf delta-diff
-
-.PHONY: web-manual
-web-manual:
- cd $(srcdir)/doc; \
- rm -f gendocs.sh* gendocs_template*; \
- test -d manual && rm -rf manual; \
- $(WGETSGO)'/texinfo/texinfo/util/gendocs.sh' && \
- $(WGETSGO)'/texinfo/texinfo/util/gendocs_template' && \
- chmod 755 gendocs.sh && \
- ./gendocs.sh --email address@hidden libtool "GNU Libtool Manual"
diff --git a/NEWS b/NEWS
index 18772c8..a960e43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
NEWS - list of user-visible changes between releases of GNU Libtool
-New in 2.4.4 201?-??-??: git version 2.4.3a, Libtool team:
+* Noteworthy changes in release ?.? (????-??-??) [?]
-* Bug fixes:
+** New features:
+
+ - Moved to gnulib release infrastructure.
+
+** Bug fixes:
- Fix a long-standing latent bug in autom4te include path for autotests
with VPATH builds.
diff --git a/bootstrap.conf b/bootstrap.conf
index 0ad482a..3d36983 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
-# bootstrap.conf (GNU Libtool) version 2011-10-19
+# bootstrap.conf (GNU Libtool) version 2011-10-20
#
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2010
# This is free software; see the source for copying conditions. There is NO
@@ -60,7 +60,15 @@ gnulib_tool_options=$gnulib_tool_options"
# gnulib modules used by this package.
gnulib_modules='
+ announce-gen
+ do-release-commit-and-tag
+ gendocs
+ git-version-gen
+ gitlog-to-changelog
+ gnu-web-doc-update
+ gnupload
maintainer-makefile
+ readme-release
'
# Extra gnulib files that are not in modules, which override files of
@@ -262,6 +270,18 @@ libtool_prep ()
func_add_hook func_prep libtool_prep
+# libtool_add_libltdl_copying
+# ---------------------------
+# Use the canonical COPYING.LESSERv2 from gnulib.
+libtool_add_libltdl_copying ()
+{
+ $debug_cmd
+
+ func_gnulib_tool_copy_file doc/COPYING.LESSERv2 libltdl/COPYING.LIB
+}
+func_add_hook func_gnulib_tool libtool_add_libltdl_copying
+
+
# libtool_build_prerequisites
# ---------------------------
# Libtool generates some files that are required before any autotools
@@ -317,19 +337,32 @@ libtool_build_prerequisites ()
rm -f Makefile
test 0 -eq "$status" ||exit $EXIT_FAILURE
}
-func_add_hook func_prep libtool_build_prerequisites
+func_add_hook func_gnulib_tool libtool_build_prerequisites
-# libtool_add_libltdl_copying
-# ---------------------------
-# Use the canonical COPYING.LESSERv2 from gnulib.
-libtool_add_libltdl_copying ()
+# libtool_readme_release_package_substitutions
+# --------------------------------------------
+# Show our own package details instead of generic strings.
+libtool_readme_release_package_substitutions ()
{
$debug_cmd
- func_gnulib_tool_copy_file doc/COPYING.LESSERv2 libltdl/COPYING.LIB
+ $require_build_aux
+ $require_package
+
+ my_readme=README-release
+
+ test -f "$my_readme" \
+ || func_fatal_error "error: \`$my_readme' does not exist"
+
+ # Perform substitutions to a temporary file
+ $SED -e "\
+ s,address@hidden@,$package,g
+ s,build-aux/,$build_aux/,
+ " "$my_readme" > "${my_readme}T" \
+ && mv "${my_readme}T" "$my_readme"
}
-func_add_hook func_gnulib_tool libtool_add_libltdl_copying
+func_add_hook func_fini libtool_readme_release_package_substitutions
# libtool_fudge_timestamps
diff --git a/cfg.mk b/cfg.mk
index f2a712a..d84c6cf 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -21,12 +21,21 @@
# or obtained by writing to the Free Software Foundation, Inc.,
# 51 Franklin Street, Boston, # MA 02111-1301, USA.
-gnulib_dir = $(srcdir)/gnulib
_build-aux = libltdl/config
# Set format of NEWS
old_NEWS_hash := d41d8cd98f00b204e9800998ecf8427e
+manual_title = Portable Dynamic Shared Object Management
+
+# Set the release announcement email addresses, maint.mk will email the
+# translation-project instead of autotools-announce otherwise.
+ifeq ($(RELEASE_TYPE),stable)
+announcement_Cc_ = address@hidden
+else
+announcement_Cc_ = address@hidden, $(PACKAGE_BUGREPORT)
+endif
+
# Don't syntax check the mail subdirectory.
VC_LIST_ALWAYS_EXCLUDE_REGEX = /mail/
diff --git a/configure.ac b/configure.ac
index 5f052b0..b2aff61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,9 +31,11 @@ dnl Oldest automake required for bootstrap is below in
AM_INIT_AUTOMAKE.
## ------------------------ ##
## Autoconf initialisation. ##
## ------------------------ ##
-AC_INIT([GNU Libtool], [2.4.3a], address@hidden)
+AC_INIT([GNU Libtool],
+ m4_esyscmd([libltdl/config/git-version-gen .tarball-version]),
+ address@hidden)
m4_ifndef([AC_PACKAGE_URL],
- [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/libtool/])])
+ [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/s/libtool/])])
# Since we already declare these directories in this file, save those
# choices, and push the results into Makefile.am to avoid declaring
@@ -53,6 +55,8 @@ AC_CONFIG_AUX_DIR([libltdl/config])
AC_CONFIG_MACRO_DIR([libltdl/m4])
AC_CONFIG_LIBOBJ_DIR([libltdl])
+package_revision=`$SHELL $ac_aux_dir/git-version-gen .tarball-version`
+AC_SUBST([package_revision])
## ------------------------ ##
## Autotest initialisation. ##
@@ -67,69 +71,9 @@ AC_SUBST([AUTOTEST], ['$(AUTOM4TE) --language=autotest'])
## Display a configure time version banner. ##
## ---------------------------------------- ##
-# Calculating the previous version is somewhat involved, so do it once
-# here, and SUBST the result for the maintainer release rules. The
-# versioning scheme we use is described here:
-# http://www.gnu.org/software/libtool/contribute.html
-
-# First we break the version number up into its constituent parts.
-lt_major=`echo "AC_PACKAGE_VERSION" | sed ['s,\..*$,,g']`
-lt_minor=`echo "AC_PACKAGE_VERSION" | sed ['s,^[0-9]*\.\([0-9]*\).*$,\1,']`
-lt_micro=`echo "AC_PACKAGE_VERSION" | sed
['s,^[0-9]*\.[0-9]*\(\.[0-9]*\).*$,\1,']`
-lt_alpha=`echo "AC_PACKAGE_VERSION" | sed ['s,^[0-9.]*,,']`
-
-test "$lt_minor" = "AC_PACKAGE_VERSION" && lt_minor=0
-test "$lt_micro" = "AC_PACKAGE_VERSION" && lt_micro=""
-
-# Then we try to work out what the release before this one would have been
-# numbered. The only time we come unstuck is when this is the first release
-# from a stable branch (lt_micro=lt_alpha=""), so LASTRELEASE is the last
-# release from the old stable branch, and we don't know what version that
-# was, so leave it unset so that the Makefile can complain.
-case $lt_alpha in
- [[ab]])
- case $lt_micro in
- [.[01]])
- LASTRELEASE="$lt_major.$lt_minor" ;;
- *)
- LASTRELEASE="$lt_major.$lt_minor$lt_micro" ;;
- esac
- ;;
- [[cegikmoqsuwy]])
- LASTRELEASE=`echo "AC_PACKAGE_VERSION" | tr 'c-y' 'b-w'` ;;
- [[dfhjlnprtvxz]])
- LASTRELEASE=`echo "AC_PACKAGE_VERSION" | tr 'd-z' 'b-x'` ;;
- *) # No lt_alpha component
- case $lt_micro in
- .0)
- LASTRELEASE="" ;;
- .1)
- LASTRELEASE="$lt_major.$lt_minor" ;;
- .*)
- lt_micro_value=`echo $lt_micro | sed 's,^\.,,'`
- LASTRELEASE="$lt_major.$lt_minor.`expr $lt_micro_value - 1`" ;;
- *)
- LASTRELEASE="" ;;
- esac
- ;;
-esac
-AC_SUBST([LASTRELEASE])
-
# This is a sanity check so we can see which version is used in bug reports.
-# It is assumed that we only want to see the date extension for cvs libtool
-# versions (i.e. "odd" letters) and not actual alpha releases.
-TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp ${srcdir}`
-package_revision=`( set $TIMESTAMP; echo $1; )`
-case $lt_alpha in
- ""|[[bdfhjlnprtvxz]])
- TIMESTAMP=
- ;;
-esac
-timestamp_string="${TIMESTAMP:+ (Build:$TIMESTAMP)}"
-AS_BOX([Configuring AC_PACKAGE_TARNAME$timestamp_string AC_PACKAGE_VERSION])
+AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION])
echo
-AC_SUBST([TIMESTAMP])
-AC_SUBST([package_revision])
## ------------------------ ##
@@ -149,7 +93,7 @@ AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-xz
color-tests parallel-tests])
# You can set autobuild_mode at configure time to specify a "unique"
# string for this build.
: ${autobuild_mode=default}
-AB_VERSION="AC_PACKAGE_VERSION ($TIMESTAMP)"
+AB_VERSION="AC_PACKAGE_VERSION"
AB_INIT([$autobuild_mode])
@@ -157,7 +101,7 @@ dnl We use m4sh to generate libtool's portable shell scripts
AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh'])
dnl Make sure config.status is regenerated when the version timestamp changes
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/ChangeLog'])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(srcdir)/.version'])
## ------------------------------- ##
diff --git a/doc/.gitignore b/doc/.gitignore
index 8d60e81..2e7c6bf 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -2,5 +2,6 @@
/*.html
/fdl.texi
/gendocs_template
+/manual
/notes.txt
/version.texi
diff --git a/gl/build-aux/announce-gen.diff b/gl/build-aux/announce-gen.diff
new file mode 100644
index 0000000..937918a
--- /dev/null
+++ b/gl/build-aux/announce-gen.diff
@@ -0,0 +1,39 @@
+--- gnulib/build-aux/announce-gen 2011-10-19 01:26:27.000000000 +0700
++++ gl/build-aux/announce-gen 2011-10-19 16:54:12.000000000 +0700
+@@ -102,7 +102,7 @@
+ my %res;
+ foreach my $f (@file)
+ {
+- my $cmd = "du --human $f";
++ my $cmd = "du -h $f";
+ my $t = `$cmd`;
+ # FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS
+ $@
+@@ -449,7 +449,14 @@
+
+ <\#secure method=pgpmime mode=sign>
+
+-FIXME: put comments here
++Libtoolers!
++
++The Libtool Team is pleased to announce the release of $package_name
$curr_version.
++
++GNU Libtool hides the complexity of using shared libraries behind a
++consistent, portable interface. GNU Libtool ships with GNU libltdl, which
++hides the complexity of loading dynamic runtime libraries (modules)
++behind a consistent, portable interface.
+
+ EOF
+
+@@ -497,6 +504,11 @@
+ $release_type eq 'stable'
+ or print_changelog_deltas ($package_name, $prev_version);
+
++ print <<EOF;
++
++Enjoy!
++EOF
++
+ exit 0;
+ }
+
diff --git a/gl/build-aux/do-release-commit-and-tag.diff
b/gl/build-aux/do-release-commit-and-tag.diff
new file mode 100644
index 0000000..9dfa795
--- /dev/null
+++ b/gl/build-aux/do-release-commit-and-tag.diff
@@ -0,0 +1,22 @@
+--- gnulib/build-aux/do-release-commit-and-tag 2011-10-19 22:37:21.000000000
+0700
++++ gl/build-aux/do-release-commit-and-tag 2011-10-21 15:09:12.000000000
+0700
+@@ -74,6 +74,10 @@
+ esac
+ }
+
++for gsort in $SORT gsort sort; do
++ echo 1|$gsort -V >/dev/null 2>/dev/null && break
++done
++
+ branch=master
+ case $1 in
+ --branch) shift; branch=$1; shift ;;
+@@ -95,7 +99,7 @@
+ || die 'failed to determine previous version number from .prev-version'
+
+ # Verify that $ver is sensible (> .prev-version).
+-case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in
++case $(printf "$prev_ver\n$ver\n"|$gsort -V -u|tr '\n' ':') in
+ "$prev_ver:$ver:") ;;
+ *) die "invalid version: $ver";;
+ esac
diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
new file mode 100644
index 0000000..9f89724
--- /dev/null
+++ b/gl/top/README-release.diff
@@ -0,0 +1,38 @@
+--- gnulib/top/README-release 2011-10-23 14:32:58.000000000 +0700
++++ gl/top/README-release 2011-10-23 14:38:40.000000000 +0700
+@@ -1,5 +1,9 @@
+ Here are most of the steps we (maintainers) follow when making a release.
+
++* If you don't yet have gnu ftp upload rights, read this:
++
++
https://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html#Automated-Upload-Registration
++
+ * start from a clean, up-to-date git directory.
+
+ make -k maintainer-clean || { ./configure && make maintainer-clean; }
+@@ -18,12 +24,24 @@
+
+ http://hydra.nixos.org/jobset/gnu/@address@hidden
+
+-* Run "./bootstrap && ./configure". This downloads any new translations:
++* Double check that serial number updates in public m4 files weren't
++ forgotten since last release (they should be updated in git along with
++ commits that require it so that users can work with git snapshots).
++
++* Update the LTDL_VERSION_INFO in libltdl/Makefile.inc for changes since
++ the last release.
++
++* Run "./bootstrap && ./configure".
+
+ * Pre-release testing:
+ Ensure that "make check syntax-check" succeeds.
+
+ * Run "make distcheck"
++ and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'
++ and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g'
++ and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-shared'
++ and `make distcheck CC=g++'
++ If there are any problems, fix them and start again.
+
+ * Set the date, version number, and release type [stable/alpha/beta] on
+ line 3 of NEWS, commit that, and tag the release by running e.g.,
diff --git a/libltdl/config/.gitignore b/libltdl/config/.gitignore
index d6138cc..e2c12dd 100644
--- a/libltdl/config/.gitignore
+++ b/libltdl/config/.gitignore
@@ -1,6 +1,11 @@
+/announce-gen
/compile
/depcomp
+/do-release-commit-and-tag
/gendocs.sh
+/git-version-gen
+/gnu-web-doc-update
+/gnupload
/install-sh
/ltmain.in
/ltmain.sh
@@ -10,3 +15,4 @@
/texinfo.tex
/useless-if-before-free
/vc-list-files
+/gitlog-to-changelog
diff --git a/libltdl/config/cvsu b/libltdl/config/cvsu
new file mode 100755
index 0000000..741f6b2
--- /dev/null
+++ b/libltdl/config/cvsu
@@ -0,0 +1,512 @@
+#! /usr/bin/perl -w
+
+# cvsu - do a quick check to see what files are out of date.
+#
+# Copyright (C) 2000-2005 Pavel Roskin <address@hidden>
+# Initially written by Tom Tromey <address@hidden>
+# Completely rewritten by Pavel Roskin <address@hidden>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+require 5.004;
+use Getopt::Long;
+use File::Basename;
+use Time::Local;
+use strict;
+
+use vars qw($list_types %messages %options @batch_list $batch_cmd
+ $no_recurse $explain_type $find_mode $short_print
+ $no_cvsignore $nolinks $file $single_filename $curr_dir
+ @common_ignores $ignore_rx %entries %subdirs %removed);
+
+use constant SUBDIR_FOUND => 1;
+use constant SUBDIR_CVS => 2;
+
+# This list comes from the CVS manual.
+use constant STANDARD_IGNORES =>
+ ('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags',
+ 'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*',
+ "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej',
+ '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe',
+ '*.Z', '*.elc', '*.ln', 'core');
+
+# 3-letter month names in POSIX locale, for fast date decoding
+my %months = (
+ "Jan" => 0,
+ "Feb" => 1,
+ "Mar" => 2,
+ "Apr" => 3,
+ "May" => 4,
+ "Jun" => 5,
+ "Jul" => 6,
+ "Aug" => 7,
+ "Sep" => 8,
+ "Oct" => 9,
+ "Nov" => 10,
+ "Dec" => 11
+);
+
+# print usage information and exit
+sub usage ()
+{
+ print "Usage:\n" .
+ " cvsu [OPTIONS] [FILE] ...\n" .
+ "Options:\n" .
+ " --local Disable recursion\n" .
+ " --explain Verbosely print status of files\n" .
+ " --find Emulate find - filenames only\n" .
+ " --short Don't print paths\n" .
+ " --ignore Don't read .cvsignore\n" .
+ " --messages List known file types and long messages\n" .
+ " --nolinks Disable recognizing hard and soft links\n" .
+ " --types=[^]LIST Print only file types [not] from LIST\n" .
+ " --batch=COMMAND Execute this command on files\n" .
+ " --help Print this usage information\n" .
+ " --version Print version number\n" .
+ "Abbreviations and short options are supported\n";
+ exit 0;
+}
+
+# print version information and exit
+sub version ()
+{
+ print "cvsu - CVS offline examiner, version 0.2.3\n";
+ exit 0;
+}
+
+# If types begin with '^', make inversion
+sub adjust_types ()
+{
+ if ($list_types =~ m{^\^(.*)$}) {
+ $list_types = "";
+ foreach (keys %messages) {
+ $list_types .= $_
+ if (index ($1, $_) < 0);
+ }
+ }
+}
+
+# list known messages and exit
+sub list_messages ()
+{
+ my $default_mark;
+ print "Recognizable file types are:\n";
+ foreach (sort keys %messages) {
+ if (index($list_types, $_) >= 0) {
+ $default_mark = "*";
+ } else {
+ $default_mark = " ";
+ }
+ print " $default_mark $_ $messages{$_}\n";
+ }
+ print "* indicates file types listed by default\n";
+ exit 0;
+}
+
+# Initialize @common_ignores
+# Also read $HOME/.cvsignore and append it to @common_ignores
+sub init_ignores ()
+{
+ my $HOME = $ENV{"HOME"};
+
+ push @common_ignores, STANDARD_IGNORES;
+
+ unless (defined($HOME)) {
+ return;
+ }
+
+ my $home_cvsignore = "${HOME}/.cvsignore";
+
+ if (-f "$home_cvsignore") {
+
+ unless (open (CVSIGNORE, "< $home_cvsignore")) {
+ error ("couldn't open $home_cvsignore: $!");
+ }
+
+ while (<CVSIGNORE>) {
+ push (@common_ignores, split);
+ }
+
+ close (CVSIGNORE);
+ }
+
+ my $CVSIGNOREENV = $ENV{"CVSIGNORE"};
+
+ unless (defined($CVSIGNOREENV)) {
+ return;
+ }
+
+ my @ignores_var = split (/ /, $CVSIGNOREENV);
+ push (@common_ignores, @ignores_var);
+
+}
+
+# Print message and exit (like "die", but without raising an exception).
+# Newline is added at the end.
+sub error ($)
+{
+ print STDERR "cvsu: ERROR: " . shift(@_) . "\n";
+ exit 1;
+}
+
+# execute commands from @exec_list with $exec_cmd
+sub do_batch ()
+{
+ my @cmd_list = split (' ', $batch_cmd);
+ system (@cmd_list, @batch_list);
+}
+
+# print files status
+# Parameter 1: status in one-letter representation
+sub file_status ($)
+{
+ my $type = shift (@_);
+ my $item;
+ my $pathfile;
+
+ return
+ if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/;
+
+ return
+ if (index($list_types, $type) < 0);
+
+ $pathfile = $curr_dir . $file;
+
+ if (defined($batch_cmd)) {
+ push (@batch_list, $pathfile);
+ # 1000 items in the command line might be too much for HP-UX
+ if ($#batch_list > 1000) {
+ do_batch();
+ undef @batch_list;
+ }
+ }
+
+ if ($short_print) {
+ $item = $file;
+ } else {
+ $item = $pathfile;
+ }
+
+ if ($find_mode) {
+ print "$item\n";
+ } else {
+ $type = $messages{$type}
+ if ($explain_type);
+ print "$type $item\n";
+ }
+}
+
+# load entries from CVS/Entries and CVS/Entries.Log
+# Parameter 1: file name for CVS/Entries
+# Return: list of entries in the format used in CVS/Entries
+sub load_entries ($);
+sub load_entries ($)
+{
+ my $entries_file = shift (@_);
+ my $entries_log_file = "$entries_file.Log";
+ my %ent = ();
+
+ unless (open (ENTRIES, "< $entries_file")) {
+ error ("couldn't open $entries_file: $!");
+ }
+ while (<ENTRIES>) {
+ chomp;
+ $ent{$_} = 1;
+ }
+ close (ENTRIES);
+
+ if (open (ENTRIES, "< $entries_log_file")) {
+ while (<ENTRIES>) {
+ chomp;
+ if ( m{^A (.+)} ) {
+ $ent{$1} = 1;
+ } elsif ( m{^R (.+)} ) {
+ delete $ent{$1};
+ } else {
+ # Note: "cvs commit" helps even when you are offline
+ error ("$entries_log_file:$.: unrecognizable line, " .
+ "try \"cvs commit\"");
+ }
+ }
+ close (ENTRIES);
+ }
+
+ return keys %ent;
+}
+
+# process one directory
+# Parameter 1: directory name
+sub process_arg ($);
+sub process_arg ($)
+{
+ my $arg = shift (@_);
+ my %found_files = ();
+
+ # $file, $curr_dir, and $ignore_rx must be seen in file_status
+ local $file = "";
+ local $ignore_rx = "";
+ local $single_filename = 0;
+
+ if ( $arg eq "" or -d $arg ) {
+ $curr_dir = $arg;
+ my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir;
+
+ error ("$real_curr_dir is not a directory")
+ unless ( -d $real_curr_dir );
+
+ # Scan present files.
+ file_status (".");
+ opendir (DIR, $real_curr_dir) ||
+ error ("couldn't open directory $real_curr_dir: $!");
+ foreach (readdir (DIR)) {
+ $found_files {$_} = 1;
+ }
+ closedir (DIR);
+ } else {
+ $single_filename = basename $arg;
+ $curr_dir = dirname $arg;
+ $found_files{$single_filename} = 1 if lstat $arg;
+ }
+
+ $curr_dir .= "/"
+ unless ( $curr_dir eq "" || $curr_dir =~ m{/$} );
+
+ # Scan CVS/Entries.
+ my %entries = ();
+ my %subdirs = ();
+ my %removed = ();
+
+ foreach ( load_entries ("${curr_dir}CVS/Entries") ) {
+ if ( m{^D/([^/]+)/} ) {
+ $subdirs{$1} = SUBDIR_FOUND if !$single_filename;
+ } elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) {
+ if ( !$single_filename or $single_filename eq $1 ) {
+ $entries{$1} = $3;
+ $removed{$1} = 1
+ if $2 eq '-';
+ }
+ } elsif ( m{^D$} ) {
+ next;
+ } else {
+ error ("${curr_dir}CVS/Entries: unrecognizable line");
+ }
+ }
+
+ if ( $single_filename && !$entries{$single_filename} &&
+ !$found_files{$single_filename} ) {
+ error ("nothing known about $arg");
+ }
+
+ # Scan .cvsignore if any
+ unless ($no_cvsignore) {
+ my (@ignore_list) = ();
+
+ if (-f "${curr_dir}.cvsignore") {
+ open (CVSIGNORE, "< ${curr_dir}.cvsignore")
+ || error ("couldn't open ${curr_dir}.cvsignore: $!");
+ while (<CVSIGNORE>) {
+ push (@ignore_list, split);
+ }
+ close (CVSIGNORE);
+ }
+
+ my ($iter);
+ foreach $iter (@ignore_list, @common_ignores) {
+ if ($iter eq '!') {
+ $ignore_rx = ''
+ } else {
+ if ($ignore_rx eq '') {
+ $ignore_rx = '^(';
+ } else {
+ $ignore_rx .= '|';
+ }
+ $ignore_rx .= glob_to_rx ($iter);
+ }
+ }
+ $ignore_rx .= ')$'
+ if $ignore_rx ne '';
+ }
+
+ # File is missing
+ foreach $file (sort keys %entries) {
+ unless ($found_files{$file}) {
+ if ($removed{$file}) {
+ file_status("R");
+ } else {
+ file_status("U");
+ }
+ }
+ }
+
+ foreach $file (sort keys %found_files) {
+ next if ($file eq '.' || $file eq '..');
+ lstat ($curr_dir . $file) ||
+ error ("lstat() failed on $curr_dir . $file");
+ if (! $nolinks && -l _) {
+ file_status ("L");
+ } elsif (-d _) {
+ if ($file eq 'CVS') {
+ file_status ("C");
+ } elsif ($subdirs{$file}) {
+ $subdirs{$file} = SUBDIR_CVS;
+ } else {
+ file_status ("D"); # Unknown directory
+ }
+ } elsif (! (-f _) && ! (-l _)) {
+ file_status ("S"); # This must be something very special
+ } elsif (! $nolinks && (stat _) [3] > 1 ) {
+ file_status ("H"); # Hard link
+ } elsif (! $entries{$file}) {
+ file_status ("?");
+ } elsif ($entries{$file} =~ /^Initial |^dummy /) {
+ file_status ("A");
+ } elsif ($entries{$file} =~ /^Result of merge/) {
+ file_status ("G");
+ } elsif ($entries{$file} !~
+ /^(...) (...) (..) (..):(..):(..) (....)$/) {
+ error ("Invalid timestamp for $curr_dir$file: $entries{$file}");
+ } else {
+ my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900);
+ my $mtime = (stat _) [9];
+ if ($cvtime == $mtime) {
+ file_status ("F");
+ } elsif ($cvtime < $mtime) {
+ file_status ("M");
+ } else {
+ file_status ("O");
+ }
+ }
+ }
+
+ # Now do directories.
+ unless ($no_recurse) {
+ my $save_curr_dir = $curr_dir;
+ foreach $file (sort keys %subdirs) {
+ if ($subdirs{$file} == SUBDIR_FOUND) {
+ $curr_dir = $save_curr_dir;
+ file_status ("X");
+ } elsif ($subdirs{$file} == SUBDIR_CVS) {
+ process_arg ($save_curr_dir . $file)
+ }
+ }
+ }
+}
+
+# Turn a glob into a regexp without recognizing square brackets.
+sub glob_to_rx_simple ($)
+{
+ my ($expr) = @_;
+ # Quote all non-word characters, convert ? to . and * to .*
+ $expr =~ s/(\W)/\\$1/g;
+ $expr =~ s/\\\*/.*/g;
+ $expr =~ s/\\\?/./g;
+ return $expr;
+}
+
+# Turn a glob into a regexp
+sub glob_to_rx ($)
+{
+ my $result = '';
+ my ($expr) = @_;
+ # Find parts in square brackets and copy them literally
+ # Text outside brackets is processed by glob_to_rx_simple()
+ while ($expr ne '') {
+ if ($expr =~ /^(.*?)(\[.*?\])(.*)/) {
+ $expr = $3;
+ $result .= glob_to_rx_simple ($1) . $2;
+ } else {
+ $result .= glob_to_rx_simple ($expr);
+ last;
+ }
+ }
+ return $result;
+}
+
+sub Main ()
+{
+ # types of files to be listed
+ $list_types = "^.FCL";
+
+ # long status messages
+ %messages = (
+ "?" => "Unlisted file",
+ "." => "Known directory",
+ "F" => "Up-to-date file",
+ "C" => "CVS admin directory",
+ "M" => "Modified file",
+ "S" => "Special file",
+ "D" => "Unlisted directory",
+ "L" => "Symbolic link",
+ "H" => "Hard link",
+ "U" => "Lost file",
+ "X" => "Lost directory",
+ "A" => "Newly added",
+ "O" => "Older copy",
+ "G" => "Result of merge",
+ "R" => "Removed file"
+ );
+
+ undef @batch_list; # List of files for batch processing
+ undef $batch_cmd; # Command to be executed on files
+ $no_recurse = 0; # If this is set, do only local files
+ $explain_type = 0; # Verbosely print status of files
+ $find_mode = 0; # Don't print status at all
+ $short_print = 0; # Print only filenames without path
+ $no_cvsignore = 0; # Ignore .cvsignore
+ $nolinks = 0; # Do not test for soft- or hard-links
+ my $want_msg = 0; # List possible filetypes and exit
+ my $want_help = 0; # Print help and exit
+ my $want_ver = 0; # Print version and exit
+
+ my %options = (
+ "types=s" => \$list_types,
+ "batch=s" => \$batch_cmd,
+ "local" => \$no_recurse,
+ "explain" => \$explain_type,
+ "find" => \$find_mode,
+ "short" => \$short_print,
+ "ignore" => \$no_cvsignore,
+ "messages" => \$want_msg,
+ "nolinks" => \$nolinks,
+ "help" => \$want_help,
+ "version" => \$want_ver
+ );
+
+ GetOptions(%options);
+
+ adjust_types();
+
+ list_messages() if $want_msg;
+ usage() if $want_help;
+ version() if $want_ver;
+
+ unless ($no_cvsignore) {
+ init_ignores();
+ }
+
+ if ($#ARGV < 0) {
+ @ARGV = ("");
+ }
+
+ foreach (@ARGV) {
+ process_arg ($_);
+ }
+
+ if ($#batch_list >= 0) {
+ do_batch();
+ }
+}
+
+Main();
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 2641327..e8c7d51 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1,6 +1,6 @@
m4_define([_m4_divert(SCRIPT)], 100)
m4_divert_push([SCRIPT])
-# libtool (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
+# libtool (GNU @PACKAGE@) @VERSION@
# Written by Gordon Matzigkeit <address@hidden>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
@@ -71,7 +71,7 @@ m4_divert_push([SCRIPT])
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
+# $progname: (GNU @PACKAGE@) @VERSION@
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -82,7 +82,6 @@ m4_divert_push([SCRIPT])
PROGRAM=libtool
address@hidden@
address@hidden@
-TIMESTAMP="@TIMESTAMP@"
address@hidden@
# Be Bourne compatible
@@ -663,7 +662,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -2477,7 +2476,7 @@ func_generate_dlsyms ()
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation.
*/
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
@@ -3054,7 +3053,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3146,7 +3145,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU
$PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE)
$VERSION\" 1>&2
fi
}
@@ -3353,7 +3352,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -3626,7 +3625,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU
$PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE)
$VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -8592,7 +8591,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
diff --git a/libltdl/config/mkstamp b/libltdl/config/mkstamp
deleted file mode 100755
index edd5be1..0000000
--- a/libltdl/config/mkstamp
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-
-# mkstamp - extract data from Revision and Date RCS tags in a file
-# Copyright (C) 1999, 2003 Free Software Foundation, Inc.
-# Written by Alexandre Oliva, 1999
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-####
-
-# This script takes a directory as an argument and generates a
-# revision and date based upon the ChangeLog files in that directory.
-
-# Generate a revision that looks similar to CVS revision by using 1.
-# then the number of lines in the ChangeLogs starting with dates (an
-# approximation of the number of commits) + 1000.
-# For those pulling from the savannah git repository it should be
-# possible to go from this revision number to the git revision fairly
-# easily. The number will also always increase.
-
-awk 'BEGIN {
- cocount=0;
-}
-/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] / {
- if (cocount== 0) {
- datestr=$1
- }
- cocount++;
-}
-END {
- cocount = cocount + 1000;
- print "1." cocount " " datestr;
-}' $1/ChangeLog $1/ChangeLog.[12][0-9][0-9][0-9]
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 44e0ecf..00c1102 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -719,7 +719,7 @@ _LT_CONFIG_SAVE_COMMANDS([
#! $SHELL
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building
support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -775,7 +775,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 69fd37f..1626c17 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1,6 +1,6 @@
m4_pattern_allow([dnl])
AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
-# libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
+# libtoolize (GNU @PACKAGE@) @VERSION@
# Written by Gary V. Vaughan <address@hidden>, 2003
# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -59,7 +59,7 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])
# include the following information:
#
# host-triplet: @host_triplet@
-# $progname: (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
+# $progname: (GNU @PACKAGE@) @VERSION@
# automake: $automake_version
# autoconf: $autoconf_version
#
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-34-gbba5b84,
Gary V. Vaughan <=