[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-41-ge2c4184
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-41-ge2c4184 |
|
Date: |
Sat, 05 Nov 2011 10:32:09 +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 e2c4184c38c48654e2da6728ead73314052516f6 (commit)
via 363a9a0732fe1ddfab43dd359ab7b56e31a30558 (commit)
via 99df00368456ee1d4e7d5147e58fab589044daa8 (commit)
from af4537cd8a1308a1c783519fccd71e08392ea66c (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 e2c4184c38c48654e2da6728ead73314052516f6
Author: Gary V. Vaughan <address@hidden>
Date: Sun Oct 30 11:03:00 2011 +0700
maint: dynamically strip unused scripts from libltdl Makefile.
* configure.ac (pkgaux_scripts): Centrally maintain the complete
list of aux scripts required to build libltdl, and which need to
be installed by libtoolize --ltdl, and consequently need to be
placed in $pkgdatadir by make install.
* Makefile.am (libltdl/stamp.mk): Improved to strip the unused
scripts not listed in pkgaux_scripts without the need for manual
synchronisation.
(auxexefiles): Removed. Replaced by new pkgaux_scripts
substitution.
(install-data-local): Adjust.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 363a9a0732fe1ddfab43dd359ab7b56e31a30558
Author: Gary V. Vaughan <address@hidden>
Date: Thu Oct 27 11:50:53 2011 +0700
build: substitute paths into defs.m4sh instead of recalculating.
* Makefile.am (configure_edit): Add substitutions for aux_dir,
macro_dir and srcdir.
* tests/defs.m4sh: Don't recalculate srcdir.
(aux_dir, macro_dir, srcdir): Convert to absolute paths.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit 99df00368456ee1d4e7d5147e58fab589044daa8
Author: Gary V. Vaughan <address@hidden>
Date: Mon Oct 31 15:21:40 2011 +0700
build: support AM_SILENT_RULES
* configure.ac: Add AM_SILENT_RULES.
* libltdl/configure.ac: Ditto, but only if defined.
* Makefile.am (.version, ChangeLog, README, doc/notes.txt)
(libtool, libtoolize, libtoolize.in, libltdl/Makefile.am)
(libltdl/stamp-mk, m4/ltversion.m4, tests/atconfig, tests/defs)
(tests/defs.in, tests/package.m4): Output an AM_SILENT_RULES-like
GEN when V==0.
* libltdl/Makfile.inc (libltdl/argz.h): Ditto.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 119 ++++++++++++++++++++++++++++----------------------
configure.ac | 8 +++
libltdl/Makefile.inc | 6 +-
libltdl/configure.ac | 1 +
tests/defs.m4sh | 11 +---
5 files changed, 82 insertions(+), 63 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 38582ef..66d09f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,8 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
else \
serial=`$(git_commit_count)`; \
fi; \
- echo "$(bootstrap_edit) '$(ltversion_in)' > '$@'"; \
+ if test 0 = '$(V)'; then echo " GEN " $@; \
+ else echo "$(bootstrap_edit) '$(ltversion_in)' > '$@'"; fi; \
$(bootstrap_edit) '$(ltversion_in)' > '$@'; \
chmod a-w '$@'; \
fi
@@ -170,21 +171,22 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
done; \
if $$rebuild; then \
rm -f '$@'; \
- echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'"; \
+ if test 0 = '$(V)'; then echo " GEN " $@; \
+ else echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'";
fi; \
$(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) > '$@'
+ $(AM_V_GEN)$(LT_M4SH) '$(libtoolize_m4sh)' | $(bootstrap_edit) > '$@'
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 '$@'
- ( '$(SED)' -n '1,/^.. DO NOT REMOVE THIS LINE -- /p' \
+ $(AM_V_at)rm -f '$@'
+ $(AM_V_GEN)( '$(SED)' -n '1,/^.. DO NOT REMOVE THIS LINE -- /p' \
'$(lt_Makefile_inc)'; \
{ echo 'ACLOCAL_AMFLAGS = -I m4'; \
echo 'AUTOMAKE_OPTIONS = foreign'; \
@@ -205,7 +207,7 @@ $(lt_Makefile_am): $(lt_Makefile_inc)
-e 's,\$$(libltdl_,$$(,' \
) |'$(SED)' -e '/^.. DO NOT REMOVE THIS LINE -- /d' \
-e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with
automake to produce Makefile.in,' > '$@'
- chmod a-w '$@'
+ $(AM_V_at)chmod a-w '$@'
## Document the make macros that are needed to build bootstrap-deps
## dependencies when called from `bootstrap' (developer's machine),
@@ -246,7 +248,7 @@ bootstrap-deps-prep:
&& echo "ERROR: don't call $(MAKE) with VERSION unset." \
&& exit_cmd=exit; \
$$exit_cmd 1
- rm -f $(bootstrap_files)
+ $(AM_V_at)rm -f $(bootstrap_files)
## Unfortunately, all this bogeyness means that we have to manually
## keep the generated files in libltdl up to date.
@@ -266,26 +268,29 @@ all-local: $(LTDL_BOOTSTRAP_DEPS)
configure_edit = $(SED) \
-e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
-e 's,@aclocaldir\@,$(aclocaldir),g' \
+ -e 's,@aux_dir\@,$(aux_dir),g' \
-e 's,@datadir\@,$(datadir),g' \
-e 's,@EGREP\@,$(EGREP),g' \
-e 's,@FGREP\@,$(FGREP),g' \
-e 's,@GREP\@,$(GREP),g' \
-e 's,@host_triplet\@,$(host_triplet),g' \
-e 's,@LN_S\@,$(LN_S),g' \
+ -e 's,@macro_dir\@,$(macro_dir),g' \
-e "s,@pkgconfig_files\@,$(auxfiles),g" \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
-e 's,@prefix\@,$(prefix),g' \
- -e 's,@SED\@,$(SED),g'
+ -e 's,@SED\@,$(SED),g' \
+ -e 's,@srcdir\@,$(srcdir),g'
# The libtool distributor and the standalone libtool script.
bin_SCRIPTS = libtoolize libtool
libtoolize: $(libtoolize_in) $(config_status)
- rm -f '$@'
- $(configure_edit) '$(libtoolize_in)' > '$@'
- chmod a+x '$@'
- chmod a-w '$@'
+ $(AM_V_at)rm -f '$@'
+ $(AM_V_GEN)$(configure_edit) '$(libtoolize_in)' > '$@'
+ $(AM_V_at)chmod a+x '$@'
+ $(AM_V_at)chmod a-w '$@'
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
# would rerun configure on every invocation, so now we manually
@@ -300,14 +305,15 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
case $$prereq in *.version);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
- echo '$(SHELL) ./config.status "$@"'; \
+ if test 0 = '$(V)'; then echo " GEN " $@; \
+ else echo '$(SHELL) $(top_builddir)/config.status "$@"'; fi; \
cd '$(top_builddir)' && '$(SHELL)' ./config.status '$@'; \
fi
.PHONY: configure-subdirs
configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
@DIST_MAKEFILE_LIST@:
- dir=`echo '$@' |'$(SED)' 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
+ $(AM_V_at)dir=`echo '$@' |'$(SED)' 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
test -d "$$dir" || mkdir "$$dir" || exit 1; \
abs_srcdir=`$(lt__cd) '$(srcdir)' && pwd`; \
(cd "$$dir" && "$$abs_srcdir/$$dir/configure" --with-dist) || exit 1
@@ -329,15 +335,24 @@ 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 '$(ltdl_dir)' && $(AUTOMAKE) Makefile
+ $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOMAKE) Makefile
+# Don't let unused scripts leak into the libltdl Makefile
$(stamp_mk): $(lt_Makefile_in)
- T='$(ltdl_dir)/Makefile.tmp'; \
- '$(SED)' -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
- -e 's,config/mkinstalldirs,,' \
- < '$(lt_Makefile_in)' > "$$T" && \
- mv -f "$$T" '$(lt_Makefile_in)'
- echo stamp > '$@'
+ $(AM_V_at)T='$(ltdl_dir)/Makefile.tmp'; \
+ for p in $(ltdl_dir)/config/*; do \
+ test -f "$$p" || continue; \
+ f=`echo "$$p" | $(SED) 's,^$(ltdl_dir)/,,'`; \
+ case " $(pkgaux_scripts) " in \
+ *" $$f "*) ;; \
+ *) '$(SED)' \
+ -e 's,\(\$$([^)]*)/\)*'"$$f"'\$$,,' \
+ -e 's,\(\$$([^)]*)/\)*'"$$f"' ,,' \
+ '$(lt_Makefile_in)' > "$$T" \
+ && mv -f "$$T" '$(lt_Makefile_in)';; \
+ esac; \
+ done
+ $(AM_V_GEN)echo stamp > '$@'
lt_aclocal_m4_deps = \
$(lt_obsolete_m4) \
@@ -352,14 +367,14 @@ lt_aclocal_m4_deps = \
lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
$(lt_aclocal_m4): $(lt_aclocal_m4_deps)
- cd '$(ltdl_dir)' && $(ACLOCAL) -I m4
+ $(AM_V_GEN)cd '$(ltdl_dir)' && $(ACLOCAL) -I m4
$(lt_configure): $(lt_configure_deps)
- cd '$(ltdl_dir)' && $(AUTOCONF)
+ $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOCONF)
$(lt_config_h_in): $(lt_configure_deps)
- cd '$(ltdl_dir)' && $(AUTOHEADER)
- touch '$@'
+ $(AM_V_GEN)cd '$(ltdl_dir)' && $(AUTOHEADER)
+ $(AM_V_at)touch '$@'
## -------------- ##
@@ -392,8 +407,8 @@ DISTCLEANFILES += libtool.dvi
all-local: $(notes_txt)
$(notes_txt): $(notes_texi)
- $(MAKEINFO) -P '$(srcdir)/doc' --no-headers $(MAKEINFOFLAGS) \
- -o '$@' '$(notes_texi)'
+ $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
+ $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
dist_man1_MANS = $(libtool_1) $(libtoolize_1)
MAINTAINERCLEANFILES += $(dist_man1_MANS)
@@ -406,21 +421,18 @@ update_mans = \
# 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
+ $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
$(libtoolize_1): $(libtoolize_in)
- $(update_mans) libtoolize
+ $(AM_V_GEN)$(update_mans) libtoolize
## ------------- ##
## Installation. ##
## ------------- ##
-# These are required by libtoolize and must be executable when installed.
# The timestamps on these files must be preserved carefully so we install,
# uninstall and set executable with custom rules here.
-auxexefiles = config/compile config/config.guess config/config.sub \
- config/depcomp config/install-sh config/missing
-auxfiles = $(auxexefiles) config/ltmain.sh
+auxfiles = $(pkgaux_scripts) config/ltmain.sh
# Everything that gets picked up by aclocal is automatically distributed,
# this is the list of macro files we install on the user's system.
@@ -466,7 +478,7 @@ install-data-local: $(lt_Makefile_in)
## install the helper scripts
$(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)'
$(mkinstalldirs) '$(DESTDIR)$(pkgdatadir)/config'
- @list='$(auxexefiles)' && for p in $$list; do \
+ @list='$(pkgaux_scripts)' && for p in $$list; do \
echo " $(INSTALL_SCRIPT) '$(ltdl_dir)/$$p'
'$(DESTDIR)$(pkgdatadir)/$$p'"; \
$(INSTALL_SCRIPT) "$(ltdl_dir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
done
@@ -499,7 +511,7 @@ changelog = $(distdir)/ChangeLog
# date is updated to the following year.
changelog_start_date = 2011-01-01
$(changelog): FORCE
- if test -d .git; then \
+ $(AM_V_GEN)if test -d .git; then \
$(gitlog_to_changelog) --since=$(changelog_start_date) >
'address@hidden'; \
rm -f '$@'; mv 'address@hidden' '$@'; \
fi
@@ -509,14 +521,17 @@ $(changelog): FORCE
EXTRA_DIST += $(dotversion)
BUILT_SOURCES += $(dotversion)
$(dotversion):
- echo '$(VERSION)' > 'address@hidden' && mv 'address@hidden' '$@'
+ $(AM_V_GEN)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) '$@'
+ @if test -n `expr $(VERSION) : $(re_odd_version)`; then \
+ if test 0 = '$(V)'; then echo " GEN " $@; \
+ else echo "$(SHELL) $(edit_readme_alpha) $@"; fi; \
+ $(SHELL) $(edit_readme_alpha) '$@'; \
+ fi
git_commit_count = git log --pretty=oneline |wc -l |$(SED) 's,[ ],,g'
@@ -527,7 +542,7 @@ dist-hook: $(changelog) $(dotversion) $(readme)
## ...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 \
+ @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; \
@@ -654,10 +669,10 @@ INSTALLCHECK_ENVIRONMENT = \
tst_aclocaldir="$(aclocaldir)"
$(testsuite): $(package_m4) $(TESTSUITE_AT) Makefile.am
- $(AUTOTEST) -I '$(srcdir)' -I '$(srcdir)/tests' $(TESTSUITE_AT) -o '$@'
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -I '$(srcdir)/tests'
$(TESTSUITE_AT) -o '$@'
$(package_m4): $(dotversion) Makefile.am
- { \
+ $(AM_V_GEN){ \
echo '# Signature of the current package.'; \
echo 'm4_define([AT_PACKAGE_NAME], address@hidden@])'; \
echo 'm4_define([AT_PACKAGE_TARNAME], address@hidden@])'; \
@@ -668,7 +683,7 @@ $(package_m4): $(dotversion) Makefile.am
} > '$@'
tests/atconfig: $(config_status)
- '$(SHELL)' '$(config_status)' '$@'
+ $(AM_V_GEN)$(SHELL) '$(config_status)' '$@'
DISTCLEANFILES += tests/atconfig
@@ -680,25 +695,25 @@ testsuite_deps_uninstalled = $(testsuite_deps)
libltdl/libltdlc.la \
# Hook the test suite into the check rule
check-local: $(testsuite_deps_uninstalled)
- $(CD_TESTDIR); \
+ $(AM_V_at)$(CD_TESTDIR); \
CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \
$(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS)
# Run the test suite on the *installed* tree.
installcheck-local: $(testsuite_deps)
- $(CD_TESTDIR); \
+ $(AM_V_at)$(CD_TESTDIR); \
CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \
$(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \
AUTOTEST_PATH='$(exec_prefix)/bin'
check-noninteractive-old:
- '$(MAKE)' $(AM_MAKEFLAGS) check-TESTS TESTS='$(NONINTERACTIVE_TESTS)'
+ $(AM_V_at)'$(MAKE)' $(AM_MAKEFLAGS) check-TESTS
TESTS='$(NONINTERACTIVE_TESTS)'
check-interactive-old:
- '$(MAKE)' $(AM_MAKEFLAGS) check-TESTS TESTS='$(INTERACTIVE_TESTS)'
+ $(AM_V_at)'$(MAKE)' $(AM_MAKEFLAGS) check-TESTS
TESTS='$(INTERACTIVE_TESTS)'
# Run only noninteractive parts of the new testsuite.
check-noninteractive-new: $(testsuite_deps_uninstalled)
- $(CD_TESTDIR); \
+ $(AM_V_at)$(CD_TESTDIR); \
CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \
$(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \
-k '!interactive' INNER_TESTSUITEFLAGS=',!interactive' \
@@ -706,7 +721,7 @@ check-noninteractive-new: $(testsuite_deps_uninstalled)
# Run only interactive parts of the new testsuite.
check-interactive-new: $(testsuite_deps_uninstalled)
- $(CD_TESTDIR); \
+ $(AM_V_at)$(CD_TESTDIR); \
CONFIG_SHELL='$(SHELL)' '$(SHELL)' "$$abs_srcdir/$(TESTSUITE)" \
$(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \
-k interactive -k recursive INNER_TESTSUITEFLAGS=',interactive' \
@@ -1012,12 +1027,12 @@ DIST_SUBDIRS += $(CONF_SUBDIRS)
# regenerated since the source tree can be read-only.
check-recursive: $(defs)
$(defs): $(defs_in)
- rm -f '$@'
- $(configure_edit) '$(defs_in)' > '$@'
+ $(AM_V_at)rm -f '$@'
+ $(AM_V_GEN)$(configure_edit) '$(defs_in)' > '$@'
$(defs_in): $(defs_m4sh) $(general_m4sh) Makefile.am
- rm -f '$@'
- $(LT_M4SH) '$(defs_m4sh)' > '$@'
+ $(AM_V_at)rm -f '$@'
+ $(AM_V_GEN)$(LT_M4SH) '$(defs_m4sh)' > '$@'
# We need to remove any files that the above tests created.
clean-local-legacy:
diff --git a/configure.ac b/configure.ac
index b2aff61..f3be952 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ dnl These are bootstrap requirements! Once built, libtool may
work with
dnl much older releases of autoconf and automake. See release notes.
dnl 1.11 is needed for color-tests, 1.11.1 fixes a security issue.
AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-xz color-tests
parallel-tests])
+AM_SILENT_RULES([yes])
## ------------------------- ##
@@ -117,6 +118,13 @@ if test x"${enable_ltdl_install+set}" != xset; then
enable_ltdl_install=yes
fi
+# The list of scripts required to build libltdl, and which need to be
+# installed by libtoolize --ltdl, and consequently need to be placed in
+# $pkgdatadir by our make install rule.
+pkgaux_scripts="config/compile config/config.guess config/config.sub \
+ config/depcomp config/install-sh config/missing"
+AC_SUBST([pkgaux_scripts])
+
# All subdirectories that are configured on demand, but that must be
# included in the distribution.
CONF_SUBDIRS="tests/cdemo tests/demo tests/depdemo tests/f77demo tests/fcdemo \
diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index adf2aad..931b68d 100644
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -146,8 +146,8 @@ EXTRA_DIST += libltdl/argz_.h \
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): libltdl/$(ARGZ_H)
libltdl/argz.h: libltdl/argz_.h
- $(mkinstalldirs) . libltdl/
- cp $(srcdir)/libltdl/argz_.h address@hidden
- mv address@hidden $@
+ $(AM_V_at)$(mkinstalldirs) . libltdl/
+ $(AM_V_GEN)cp $(srcdir)/libltdl/argz_.h address@hidden
+ $(AM_V_at)mv address@hidden $@
MOSTLYCLEANFILES += libltdl/argz.h \
libltdl/argz.h-t
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index e3607db..9b737c2 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -53,6 +53,7 @@ LT_CONFIG_LTDL_DIR([.]) # I am me!
## ------------------------ ##
AM_INIT_AUTOMAKE([gnu])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
## ------------------------------- ##
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 6a48079..25bab38 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -52,11 +52,6 @@ DEBUG | debug )
;;
esac
-if test -z "$srcdir"; then
- srcdir=`$ECHO "$0" | $SED "$dirname; s,/tests\$,,"`
- test "$srcdir" = "$0" && srcdir=.
-fi
-
# func_msg arg...
# Echo message with prefix.
func_msg ()
@@ -341,9 +336,9 @@ 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
+srcdir=`cd '@srcdir@' && pwd`
+macro_dir=`cd '@macro_dir@' && pwd`
+aux_dir=`cd '@aux_dir@' && pwd`
scripts="$aux_dir/ltmain.m4sh $srcdir/libtoolize.m4sh"
# Unset some MAKE... variables that may cause $MAKE to act like a
hooks/post-receive
--
GNU Libtool
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-41-ge2c4184,
Gary V. Vaughan <=