[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, libtool-next, updated. v2.4-26-g27b3a20
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, libtool-next, updated. v2.4-26-g27b3a20 |
|
Date: |
Sun, 14 Aug 2011 23:22:18 +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, libtool-next has been updated
via 27b3a20a7e3a0157b5109383ba6ff2cc16287358 (commit)
via c07adbf8068cb029c06afe0fb64c4fc81e8b71fb (commit)
via 1ace00c27adbd8370522301f4fc21e9d4f0c9651 (commit)
via a9c9b239de6b157460032e706432c0dc74b0ad75 (commit)
via 963cb4d5e39de271e4faadee2450446c087329a4 (commit)
via 2ed587d2377b283d62ea86f20a22893b0ced7bde (commit)
from 0280c3687962199479258741cef4f32a2ccb8ffd (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 27b3a20a7e3a0157b5109383ba6ff2cc16287358
Author: Gary V. Vaughan <address@hidden>
Date: Sat Sep 25 04:18:04 2010 +0700
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.
(distcheck): Added a workaround for the bug described.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit c07adbf8068cb029c06afe0fb64c4fc81e8b71fb
Author: Gary V. Vaughan <address@hidden>
Date: Sun Sep 26 18:25:36 2010 +0700
tests: remove unused `aux_dir' variable from `getopt-m4sh.test'.
* tests/getopt-m4sh.at (aux_dir): Remove unused variable.
commit 1ace00c27adbd8370522301f4fc21e9d4f0c9651
Author: Gary V. Vaughan <address@hidden>
Date: Sun Sep 26 18:19:18 2010 +0700
tests: DRYing out `tests/sh.test'.
* Makefile.am (libtool_m4): Canonical location of libtool.m4 file.
(lt_aclocal_m4_deps): Use it.
(check_scripts): New variable for list of scripts to be checked
by `tests/sh.test'.
(legacy_tests_edit): New sed script to substitute `libtool_m4'
and `check_scripts' into `tests/defs'.
(tests/defs.in): Use it.
* tests/defs.m4sh (scripts): Calculate absolute paths of each
entry in `check_scripts' before changing directories.
(libtool_m4): Save location of `libtool.m4'.
(macro_dir, aux_dir): Removed. No longer required by any test.
* tests/sh.test: Remove loop around just `$macro_dir/libtool.m4'
in favour of a single reference to `$libtool_m4' from above.
commit a9c9b239de6b157460032e706432c0dc74b0ad75
Author: Gary V. Vaughan <address@hidden>
Date: Sat Sep 25 04:01:56 2010 +0700
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.
commit 963cb4d5e39de271e4faadee2450446c087329a4
Author: Gary V. Vaughan <address@hidden>
Date: Sun Sep 26 16:21:10 2010 +0700
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.
commit 2ed587d2377b283d62ea86f20a22893b0ced7bde
Author: Gary V. Vaughan <address@hidden>
Date: Sat Sep 25 03:40:27 2010 +0700
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)'.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 59 ++++++++++++++++++++++
Makefile.am | 136 +++++++++++++++++++++++++++++++------------------
bootstrap | 14 ++++-
configure.ac | 12 ++++
tests/defs.m4sh | 17 +++++-
tests/getopt-m4sh.at | 2 -
tests/sh.test | 15 ++---
7 files changed, 188 insertions(+), 67 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 69a4e3b..a9bc65d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,64 @@
+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.
+ (distcheck): Added a workaround for the bug described.
+
+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.
+
+ tests: DRYing out `tests/sh.test'.
+ * Makefile.am (libtool_m4): Canonical location of libtool.m4 file.
+ (lt_aclocal_m4_deps): Use it.
+ (check_scripts): New variable for list of scripts to be checked
+ by `tests/sh.test'.
+ (legacy_tests_edit): New sed script to substitute `libtool_m4'
+ and `check_scripts' into `tests/defs'.
+ (tests/defs.in): Use it.
+ * tests/defs.m4sh (scripts): Calculate absolute paths of each
+ entry in `check_scripts' before changing directories.
+ (libtool_m4): Save location of `libtool.m4'.
+ (macro_dir, aux_dir): Removed. No longer required by any test.
+ * tests/sh.test: Remove loop around just `$macro_dir/libtool.m4'
+ in favour of a single reference to `$libtool_m4' from above.
+
+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)'.
+
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.
diff --git a/Makefile.am b/Makefile.am
index 6deaefc..0ad4de3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,15 +43,14 @@ noinst_LTLIBRARIES =
lib_LTLIBRARIES =
EXTRA_LTLIBRARIES =
-aux_dir = libltdl/config
-macro_dir = libltdl/m4
+m4sh_dir = $(aux_dir)
-LT_M4SH = $(M4SH) -B '$(srcdir)/$(aux_dir)'
+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)' '$(srcdir)/$(aux_dir)/mkstamp'
+MKSTAMP = '$(SHELL)' '$(aux_dir)/mkstamp'
timestamp = set dummy `$(MKSTAMP) '$(srcdir)'`; shift; \
case $(VERSION) in \
@@ -66,7 +65,13 @@ rebuild = rebuild=:; $(timestamp); revision=$$1
# Bootstrap. #
# ---------- #
-sh_files = $(aux_dir)/general.m4sh $(aux_dir)/getopt.m4sh
+defs_m4sh = $(tests_dir)/defs.m4sh
+general_m4sh = $(m4sh_dir)/general.m4sh
+getopt_m4sh = $(m4sh_dir)/getopt.m4sh
+libtoolize_m4sh = $(srcdir)/libtoolize.m4sh
+ltmain_m4sh = $(m4sh_dir)/ltmain.m4sh
+
+sh_files = $(general_m4sh) $(getopt_m4sh)
EXTRA_DIST += bootstrap $(aux_dir)/mkstamp $(sh_files) \
ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
@@ -83,11 +88,10 @@ CLEANFILES += libtool libtoolize
## and dependencies with `$(srcdir)' consistently.
configure_ac = $(srcdir)/configure.ac
libtoolize_in = $(srcdir)/libtoolize.in
-libtoolize_m4sh = $(srcdir)/libtoolize.m4sh
-ltmain_m4sh = $(srcdir)/$(aux_dir)/ltmain.m4sh
-ltmain_sh = $(srcdir)/$(aux_dir)/ltmain.sh
-ltversion_in = $(srcdir)/$(macro_dir)/ltversion.in
-ltversion_m4 = $(srcdir)/$(macro_dir)/ltversion.m4
+ltmain_sh = $(aux_dir)/ltmain.sh
+libtool_m4 = $(macro_dir)/libtool.m4
+ltversion_in = $(macro_dir)/ltversion.in
+ltversion_m4 = $(macro_dir)/ltversion.m4
EXTRA_DIST += $(libtoolize_in) $(libtoolize_m4sh) $(ltmain_m4sh) \
$(ltmain_sh) $(ltversion_in) $(ltversion_m4)
@@ -110,6 +114,12 @@ bootstrap_edit = $(SED) \
-e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-e 's,@VERSION\@,$(VERSION),g'
+## ltmain.sh needs some additional editing to remove unsubstituted
+## variable defaulting lines, because ltmain.sh never gets passed
+## through $(configure_edit).
+ltmain_sh_edit = $(bootstrap_edit) \
+ -e '/^: \$${.*="@.*@"}$$/d'
+
## We build ltversion.m4 here, instead of from config.status,
## because config.status is rerun each time one of configure's
## dependencies change and ltversion.m4 happens to be a configure
@@ -140,7 +150,7 @@ $(ltversion_m4): $(ltversion_in) $(configure_ac) ChangeLog
## would rerun configure on every invocation, so now we manually
## check the version numbers from the build rule when necessary.
## !WARNING! If you edit this rule to change the contents of ltmain.sh,
-## you must `touch $(srcdir)/$(aux_dir)/ltmain.m4sh' from the
+## you must `touch $(m4sh_dir)/ltmain.m4sh' from the
## shell if you need ltmain.sh to be regenerated. Ideally, we
## should make this rule depend on Makefile but that will break
## distcheck (at least) by rebuilding ltmain.sh in the source
@@ -156,18 +166,17 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(configure_ac)
ChangeLog
done; \
if $$rebuild; then \
rm -f '$@'; \
- echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(bootstrap_edit) > '$@'"; \
- $(LT_M4SH) '$(ltmain_m4sh)' \
- | $(bootstrap_edit) -e '/^: \$${.*="@.*@"}$$/d' > '$@'; \
+ echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'"; \
+ $(LT_M4SH) '$(ltmain_m4sh)' | $(ltmain_sh_edit) > '$@'; \
chmod a-w '$@'; \
fi
$(libtoolize_in): $(libtoolize_m4sh) $(sh_files) Makefile.am
$(LT_M4SH) '$(libtoolize_m4sh)' | $(bootstrap_edit) > '$@'
-lt_Makefile_am = $(srcdir)/libltdl/Makefile.am
-lt_Makefile_in = $(srcdir)/libltdl/Makefile.in
-lt_Makefile_inc = $(srcdir)/libltdl/Makefile.inc
+lt_Makefile_am = $(ltdl_dir)/Makefile.am
+lt_Makefile_in = $(ltdl_dir)/Makefile.in
+lt_Makefile_inc = $(ltdl_dir)/Makefile.inc
$(lt_Makefile_am): $(lt_Makefile_inc)
rm -f '$@'
@@ -306,20 +315,20 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
include libltdl/Makefile.inc
-lt_aclocal_m4 = $(srcdir)/libltdl/aclocal.m4
-lt_config_h_in = $(srcdir)/libltdl/config-h.in
-lt_configure = $(srcdir)/libltdl/configure
-stamp_mk = $(srcdir)/libltdl/stamp-mk
+lt_aclocal_m4 = $(ltdl_dir)/aclocal.m4
+lt_config_h_in = $(ltdl_dir)/config-h.in
+lt_configure = $(ltdl_dir)/configure
+stamp_mk = $(ltdl_dir)/stamp-mk
-lt_obsolete_m4 = $(srcdir)/$(macro_dir)/lt~obsolete.m4
+lt_obsolete_m4 = $(macro_dir)/lt~obsolete.m4
EXTRA_DIST += $(stamp_mk) $(lt_obsolete_m4)
$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
- cd '$(srcdir)/libltdl' && "$(AUTOMAKE)" Makefile
+ cd '$(ltdl_dir)' && "$(AUTOMAKE)" Makefile
$(stamp_mk): $(lt_Makefile_in)
- T='$(srcdir)/libltdl/Makefile.tmp'; \
+ T='$(ltdl_dir)/Makefile.tmp'; \
'$(SED)' -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
-e 's,config/mkinstalldirs,,' \
< '$(lt_Makefile_in)' > "$$T" && \
@@ -329,23 +338,23 @@ $(stamp_mk): $(lt_Makefile_in)
lt_aclocal_m4_deps = \
$(lt_obsolete_m4) \
$(ltversion_m4) \
- $(macro_dir)/libtool.m4 \
+ $(libtool_m4) \
$(macro_dir)/ltoptions.m4 \
$(macro_dir)/ltdl.m4 \
$(macro_dir)/ltsugar.m4 \
$(macro_dir)/argz.m4 \
- $(srcdir)/libltdl/configure.ac
+ $(ltdl_dir)/configure.ac
lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
$(lt_aclocal_m4): $(lt_aclocal_m4_deps)
- cd '$(srcdir)/libltdl' && "$(ACLOCAL)" -I m4
+ cd '$(ltdl_dir)' && "$(ACLOCAL)" -I m4
$(lt_configure): $(lt_configure_deps)
- cd '$(srcdir)/libltdl' && "$(AUTOCONF)"
+ cd '$(ltdl_dir)' && "$(AUTOCONF)"
$(lt_config_h_in): $(lt_configure_deps)
- cd '$(srcdir)/libltdl' && "$(AUTOHEADER)"
+ cd '$(ltdl_dir)' && "$(AUTOHEADER)"
touch '$@'
@@ -353,13 +362,22 @@ $(lt_config_h_in): $(lt_configure_deps)
## Documentation. ##
## -------------- ##
-libtool_1 = $(srcdir)/doc/libtool.1
-libtoolize_1 = $(srcdir)/doc/libtoolize.1
-notes_texi = $(srcdir)/doc/notes.texi
-notes_txt = $(srcdir)/doc/notes.txt
+doc_dir = $(srcdir)/doc
+
+libtool_1 = $(doc_dir)/libtool.1
+libtoolize_1 = $(doc_dir)/libtoolize.1
+notes_texi = $(doc_dir)/notes.texi
+notes_txt = $(doc_dir)/notes.txt
+# A bug in automake 1.11.1 (at least) prevents us from using:
+#
+# info_TEXINFOS = $(doc_dir)/libtool.texi
+#
+# Producing the following error, even though srcdir is implicitly set:
+# "cannot open < ./@srcdir@/doc/libtool.texi: No such file or directory"
info_TEXINFOS = doc/libtool.texi
-doc_libtool_TEXINFOS = doc/PLATFORMS doc/fdl.texi $(notes_texi)
+doc_libtool_TEXINFOS = $(doc_dir)/PLATFORMS $(doc_dir)/fdl.texi \
+ $(notes_texi)
EXTRA_DIST += $(notes_txt)
## Workaround for a texinfo bug described here:
## http://thread.gmane.org/gmane.comp.tex.texinfo.bugs/3930
@@ -376,10 +394,21 @@ MAINTAINERCLEANFILES += $(dist_man1_MANS)
update_mans = \
PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \
$(HELP2MAN) --output='$@'
+
+# It's wrong to make distributed files (e.g. $(libtool_1)) rely on
+# files created in the build tree, so instead we regenerate the
+# manual pages if the sources for the build-tree files we want to
+# run have changed.
$(libtool_1): $(ltmain_sh)
$(update_mans) --help-option=--help-all libtool
$(libtoolize_1): $(libtoolize_in)
$(update_mans) libtoolize
+# That doesn't solve the problem of having `make' try to create
+# manual pages before the commands have been built, for example
+# with automake-1.11.1, `make distcheck' in a freshly checked out
+# and configured tree will fail. The workaround is to make sure
+# `make check' is always called first:
+distcheck: all
## ------------- ##
@@ -431,15 +460,15 @@ install-data-local: $(lt_Makefile_in)
$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@list='$(aclocalfiles)'; for p in $$list; do \
f=`echo "$$p" |'$(SED)' 's|^.*/||'`; \
- echo " $(INSTALL_DATA) '$(srcdir)/$(macro_dir)/$$f'
'$(DESTDIR)$(aclocaldir)/$$f'"; \
- $(INSTALL_DATA) "$(srcdir)/$(macro_dir)/$$f"
"$(DESTDIR)$(aclocaldir)/$$f"; \
+ echo " $(INSTALL_DATA) '$(macro_dir)/$$f'
'$(DESTDIR)$(aclocaldir)/$$f'"; \
+ $(INSTALL_DATA) "$(macro_dir)/$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
done
## install the helper scripts
$(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)'
$(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/config'
@list='$(auxfiles)' && for p in $$list; do \
- echo " $(INSTALL_SCRIPT) '$(srcdir)/libltdl/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
- $(INSTALL_SCRIPT) "$(srcdir)/libltdl/$$p"
"$(DESTDIR)$(pkgdatadir)/$$p"; \
+ echo " $(INSTALL_SCRIPT) '$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
+ $(INSTALL_SCRIPT) "$(ltdl_dir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
done
## install the libltdl files
$(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/libltdl'
@@ -456,7 +485,7 @@ install-data-local: $(lt_Makefile_in)
## Distribution. ##
## ------------- ##
-edit_readme_alpha = $(srcdir)/$(aux_dir)/edit-readme-alpha
+edit_readme_alpha = $(aux_dir)/edit-readme-alpha
EXTRA_DIST += $(edit_readme_alpha)
@@ -490,6 +519,10 @@ dist-hook:
## Test suite. ##
## ----------- ##
+tests_dir = $(top_srcdir)/tests
+package_m4 = $(tests_dir)/package.m4
+testsuite = $(tests_dir)/testsuite
+
# The testsuite files are evaluated in the order given here.
TESTSUITE = tests/testsuite
TESTSUITE_AT = tests/testsuite.at \
@@ -556,9 +589,6 @@ TESTSUITE_AT = tests/testsuite.at \
tests/deplibs-mingw.at \
tests/sysroot.at
-package_m4 = $(srcdir)/tests/package.m4
-testsuite = $(srcdir)/$(TESTSUITE)
-
EXTRA_DIST += $(testsuite) $(TESTSUITE_AT) $(package_m4)
# Be sure to reexport important environment variables:
@@ -936,24 +966,30 @@ NONINTERACTIVE_TESTS += $(FC_TESTS)
endif
TESTS = $(NONINTERACTIVE_TESTS) $(INTERACTIVE_TESTS)
-defs_in = $(srcdir)/tests/defs.in
-defs_m4sh = $(srcdir)/tests/defs.m4sh
+defs = tests/defs
+defs_in = $(tests_dir)/defs.in
+
+check_scripts = $(ltmain_m4sh) $(libtoolize_m4sh)
EXTRA_DIST += $(defs_in) $(defs_m4sh) \
$(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) $(FC_TESTS) \
$(INTERACTIVE_TESTS)
DIST_SUBDIRS += $(CONF_SUBDIRS)
+legacy_tests_edit = $(SED) \
+ -e 's,@check_scripts\@,$(check_scripts),g' \
+ -e 's,@libtool_m4\@,$(libtool_m4),g'
+
# The defs script shouldn't be recreated whenever the Makefile is
# regenerated since the source tree can be read-only.
-check-recursive: tests/defs
-tests/defs: $(defs_in)
+check-recursive: $(defs)
+$(defs): $(defs_in)
rm -f '$@'
$(configure_edit) '$(defs_in)' > '$@'
-$(defs_in): $(defs_m4sh) $(aux_dir)/general.m4sh Makefile.am
+$(defs_in): $(defs_m4sh) $(general_m4sh) Makefile.am
rm -f '$@'
- $(LT_M4SH) '$(defs_m4sh)' > '$@'
+ $(LT_M4SH) '$(defs_m4sh)' | $(legacy_tests_edit) > '$@'
# We need to remove any files that the above tests created.
clean-local-legacy:
@@ -978,5 +1014,5 @@ fake-distclean-legacy:
else :; fi; \
done
-$(TESTS): tests/defs
-DISTCLEANFILES += tests/defs
+$(TESTS): $(defs)
+DISTCLEANFILES += $(defs)
diff --git a/bootstrap b/bootstrap
index ed630f9..94d3fb6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -67,10 +67,13 @@ test -f ./configure.ac || {
# Extract aux_dir and macro_dir from configure.ac:
lt_tab=' '
my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
- /AC_CONFIG_AUX_DIR[^_]/ {
+ /^AC_CONFIG_AUX_DIR[^_]/ {
s,^.*AC_CONFIG_AUX_DIR([[ '"$lt_tab"']*\([^])]*\).*$,aux_dir=\1,; p;
};
- /AC_CONFIG_MACRO_DIR/ {
+ /^LT_CONFIG_LTDL_DIR[^_]/ {
+ s,^.*LT_CONFIG_LTDL_DIR([[ '"$lt_tab"']*\([^])]*\).*$,ltdl_dir=\1,;
p;
+ };
+ /^AC_CONFIG_MACRO_DIR/ {
s,^.*AC_CONFIG_MACRO_DIR([[
'"$lt_tab"']*\([^])]*\).*$,macro_dir=\1,; p;
};
d;'
@@ -122,7 +125,12 @@ VERSION=$3
# Whip up a dirty Makefile:
makes='Makefile.am libltdl/Makefile.inc'
rm -f Makefile
-$SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes > Makefile
+{
+ echo "aux_dir = $aux_dir"
+ echo "ltdl_dir = $ltdl_dir"
+ echo "macro_dir = $macro_dir"
+ $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d;/^include /d' $makes
+} > Makefile
# Building distributed files from configure is bad for automake, so we
# generate them here, and have Makefile rules to keep them up to date.
diff --git a/configure.ac b/configure.ac
index 403c4b9..45cad6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,18 @@ dnl Oldest automake required for bootstrap is below in
AM_INIT_AUTOMAKE.
AC_INIT([GNU Libtool], [2.4.1a], address@hidden)
m4_ifndef([AC_PACKAGE_URL],
[AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/libtool/])])
+
+# Since we already declare these directories in this file, save those
+# choices, and push the results into Makefile.am to avoid declaring
+# them in two places making renames error prone, and where copies
+# might get out of sync.
+m4_define([AC_CONFIG_AUX_DIR],
+ m4_defn([AC_CONFIG_AUX_DIR])[AC_SUBST([aux_dir], ['${srcdir}/$1'])])
+m4_define([LT_CONFIG_LTDL_DIR],
+ m4_defn([LT_CONFIG_LTDL_DIR])[AC_SUBST([ltdl_dir], ['${srcdir}/$1'])])
+m4_define([AC_CONFIG_MACRO_DIR],
+ m4_defn([AC_CONFIG_MACRO_DIR])[AC_SUBST([macro_dir], ['${srcdir}/$1'])])
+
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([libtoolize.m4sh])
LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 6a48079..28717a9 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -342,9 +342,20 @@ func_exec ()
# Shared global variables for test scripts
prefix=./_inst-`echo "$0" | sed 's,.*/,,; s,-.*,,'`
srcdir=`cd $srcdir && pwd`
-macro_dir=$srcdir/libltdl/m4
-aux_dir=$srcdir/libltdl/config
-scripts="$aux_dir/ltmain.m4sh $srcdir/libtoolize.m4sh"
+
+# sh.test does some checks on libtool.m4.
+func_dirname_and_basename '@libtool_m4@'
+libtool_m4="`cd $func_dirname_result && pwd`/$func_basename_result"
+
+# sh.test does lots of checks on the contests of $scripts.
+scripts=
+sep=
+for script in @check_scripts@
+do
+ func_dirname_and_basename "$script"
+ scripts="$scripts$sep`cd $func_dirname_result && pwd`/$func_basename_result"
+ sep=' '
+done
# Unset some MAKE... variables that may cause $MAKE to act like a
# recursively invoked sub-make. Any $MAKE invocation in a test is
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 7c6f972..17cdb53 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -24,8 +24,6 @@
AT_BANNER([Shell option parser generator.])
-aux_dir="$abs_top_srcdir/libltdl/config"
-
# _LT_AT_GETOPT_M4SH_SETUP
# ------------------------
diff --git a/tests/sh.test b/tests/sh.test
index 4fd3bb3..9fd5899 100755
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -121,14 +121,11 @@ done
# Check for correct usage of $cc_basename.
# redirect stderr so we also barf when sed issues diagnostics.
-for s in "$macro_dir/libtool.m4"
-do
- if $SED -n '/case \$cc_basename in/,/esac/ {
- /^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p
- }' $s 2>&1 | $EGREP .; then
- echo "\$cc_basename matches should include a trailing \`*' in $s."
- status=$EXIT_FAILURE
- fi
-done
+if $SED -n '/case \$cc_basename in/,/esac/ {
+ /^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p
+ }' $libtool_m4 2>&1 | $EGREP .; then
+ echo "\$cc_basename matches should include a trailing \`*' in $libtool_m4."
+ status=$EXIT_FAILURE
+fi
exit $status
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, libtool-next, updated. v2.4-26-g27b3a20,
Gary V. Vaughan <=