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 a3b06455e9c78ba5d3b7261f1c1d6e51029f6335 (commit) via b07f86e9ea4d4036b4315f3806befe46000c6419 (commit) via 64c02af9f1d62963844f68c7d02c46d2b9100216 (commit) from cfcb7afd26a2c41f3dae62766002cac570417c77 (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 a3b06455e9c78ba5d3b7261f1c1d6e51029f6335 Author: Gary V. Vaughan <g...@gnu.org> Date: Fri Oct 19 00:49:01 2012 +0700 syntax-check: exclude false positive nested quote test. * build-aux/funclib.sh (func_echo_infix_1): These quotes are not actually nested, so add an exclude marker for the syntax-check. Signed-off-by: Gary V. Vaughan <g...@gnu.org> commit b07f86e9ea4d4036b4315f3806befe46000c6419 Author: Gary V. Vaughan <g...@gnu.org> Date: Fri Oct 19 00:38:28 2012 +0700 libtool: don't set auxscriptsdir at bootstrap time. * build-aux/ltmain.in: Declare relative paths to aux scripts from source commands, for early inlining during bootstrap. * Makefile.am (bootstrap_edit): Move auxscriptsdir substitution from here.... (configure_edit): ...to here. ($(ltmain_sh)): Feed ltmain.in through inline-source as ltmain.sh is generated to remove relative paths to aux scripts. (install-data-local): Simplify. No need for special treatment for ltmain.sh during installation, since aux scripts have already been inlined. Reported by Peter Rosin. Signed-off-by: Gary V. Vaughan <g...@gnu.org> commit 64c02af9f1d62963844f68c7d02c46d2b9100216 Author: Gary V. Vaughan <g...@gnu.org> Date: Thu Oct 18 23:41:53 2012 +0700 extract-trace: only source funclib.sh when $progname is extract-trace. * build-aux/extract-trace: $usage is too generic, and can cause sourced extract-trace to re-source options-parser. We already require that funclib.sh be sourced before sourcing options-parser, so it's safer to check that $progname is correct before sourcing options-parser again from here. Signed-off-by: Gary V. Vaughan <g...@gnu.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 20 ++++++-------------- build-aux/extract-trace | 4 ++-- build-aux/funclib.sh | 2 +- build-aux/ltmain.in | 8 +++----- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 176325c..95b8463 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,9 +93,7 @@ EXTRA_DIST += $(extract_trace) $(funclib_sh) $(inline_source) \ ## These are the replacements that need to be made at bootstrap time, ## because they must be static in distributed files, and not accidentally ## changed by configure running on the build machine. -abs_aux_dir = `$(lt__cd) '$(srcdir)/$(aux_dir)' && pwd` bootstrap_edit = $(SED) \ - -e '/^\. /s|@auxscriptsdir\@|'$(abs_aux_dir)'|g' \ -e 's|@MACRO_VERSION\@|$(VERSION)|g' \ -e "s|@MACRO_REVISION\@|$$revision|g" \ -e "s|@MACRO_SERIAL\@|$$serial|g" \ @@ -161,8 +159,8 @@ $(ltmain_sh): $(ltmain_in) $(dotversion) if $$rebuild; then \ rm -f '$@'; \ if test 0 = '$(V)'; then echo " GEN " $@; \ - else echo $(bootstrap_edit) "< '$(ltmain_in)' > '$@'"; fi; \ - $(bootstrap_edit) < '$(ltmain_in)' > '$@'; \ + else echo "$(inline_source) '$(ltmain_in)' |" $(bootstrap_edit) "> '$@'"; fi; \ + $(inline_source) '$(ltmain_in)' | $(bootstrap_edit) > '$@'; \ chmod a-w '$@'; \ fi @@ -248,9 +246,11 @@ all-local: $(LTDL_BOOTSTRAP_DEPS) ## Libtool scripts. ## ## ---------------- ## +abs_aux_dir = `$(lt__cd) '$(srcdir)/$(aux_dir)' && pwd` ltdl_ac_aux_dir = `$(extract_trace) AC_CONFIG_AUX_DIR $(srcdir)/libltdl/configure.ac` configure_edit = $(bootstrap_edit) \ + -e '/^\. /s|@auxscriptsdir\@|'$(abs_aux_dir)'|g' \ -e 's|@aclocaldir\@|$(aclocaldir)|g' \ -e 's|@aux_dir\@|$(aux_dir)|g' \ -e 's|@datadir\@|$(datadir)|g' \ @@ -494,16 +494,8 @@ install-data-local: $(lt_Makefile_in) @list='$(pkgaux_data_files)' && for p in $$list; do \ d=`echo "$(DESTDIR)$(pkgauxdir)/$$p" |$(SED) 's|[^/]*$$||'`; \ test -d "$$d" || $(mkinstalldirs) "$$d"; \ - case $$p in \ - ltmain.sh) \ - echo "$(inline_source) '$(srcdir)/$(aux_dir)/$$p' > '$(DESTDIR)$(pkgauxdir)/$$p'"; \ - $(inline_source) "$(srcdir)/$(aux_dir)/$$p" > "$(DESTDIR)$(pkgauxdir)/$$p"; \ - ;; \ - *) \ - echo " $(INSTALL_DATA) '$(srcdir)/$(aux_dir)/$$p' '$(DESTDIR)$(pkgauxdir)/$$p'"; \ - $(INSTALL_DATA) "$(srcdir)/$(aux_dir)/$$p" "$(DESTDIR)$(pkgauxdir)/$$p"; \ - ;; \ - esac; \ + echo " $(INSTALL_DATA) '$(srcdir)/$(aux_dir)/$$p' '$(DESTDIR)$(pkgauxdir)/$$p'"; \ + $(INSTALL_DATA) "$(srcdir)/$(aux_dir)/$$p" "$(DESTDIR)$(pkgauxdir)/$$p"; \ done ## install the libltdl files @list='$(pkgltdl_files)' && for p in $$list; do \ diff --git a/build-aux/extract-trace b/build-aux/extract-trace index 2143c76..d8be25c 100755 --- a/build-aux/extract-trace +++ b/build-aux/extract-trace @@ -1,8 +1,8 @@ #! /bin/sh # Make sure we've evaluated scripts we depend on. -test -n "$progpath" || . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh -test -n "$usage" || . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser +test -z "$progpath" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh +test extract-trace = "$progname" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser # Set a version string. scriptversion=2012-10-07.10; # UTC diff --git a/build-aux/funclib.sh b/build-aux/funclib.sh index 4974736..5a509d8 100644 --- a/build-aux/funclib.sh +++ b/build-aux/funclib.sh @@ -572,7 +572,7 @@ func_echo_infix_1 () _G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"` } done - _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`" " + _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes func_echo_infix_1_IFS=$IFS IFS=$nl diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in index e48e45f..b94115d 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -59,12 +59,10 @@ package_revision=@package_revision@ ## -------------------------- ## # Much of our low-level functionality needs to be sourced from external -# libraries, which are installed to $pkgauxdir under normal use, though -# we also need to be able to find them in $srcdir during testing, or if -# executed directly from the build tree. +# libraries, which are installed to $pkgauxdir. -. "@auxscriptsdir@/funclib.sh" -. "@auxscriptsdir@/options-parser" +. "build-aux/funclib.sh" +. "build-aux/options-parser" # Set a version string. scriptversion='(GNU @PACKAGE@) @VERSION@' hooks/post-receive -- GNU Libtool