[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-831-gbcade0f |
|
Date: |
Fri, 10 Aug 2012 17:43:50 +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 Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bcade0fd44698d63ef42dee21db86bbaf63c8247
The branch, ng/master has been updated
via bcade0fd44698d63ef42dee21db86bbaf63c8247 (commit)
via cbcab9ca31a167fc65f095914441d66069965ff1 (commit)
via b71160a4a1420c0e68a10b71af8d0990ab3d781d (commit)
via 5468d520e4ea5546047dca93e89787e774b96534 (commit)
via 1a0bf99a6d153629e605eb49cadfbbc6e6dbd7d8 (commit)
via 8b4d5ce79c187282fa39b53e4127af1a2c141a0a (commit)
via ae1f40f55d32d5f4fe6887ba38c56c169de83d57 (commit)
via ae1d413cb4ba860ea8e38e6748ff706d3252fa29 (commit)
via c1dd6cce90b5ad4f2292ebedfd081a660b8dc5e9 (commit)
via 133307b9ee9ac87cbfdcb8d093f192c34d3bd1f8 (commit)
via 4100c2baf7640c77d31578edb5001545a25cbec1 (commit)
via b8bc481684e9d3f602a2028a6fbe021aae60dacf (commit)
from 1a6ebd193bc78a3c6641b62df2ff5369ec09c584 (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 bcade0fd44698d63ef42dee21db86bbaf63c8247
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 19:07:04 2012 +0200
[ng] distcheck: include it as a verbatim makefile fragment
* lib/am/distcheck.am: Rename ...
* lib/am/distcheck.mk: ... like this, and adjust to use GNU
make conditionals rather than Automake ones, and to allow for
user overrides of the '$(distcleancheck_listfiles)' variable.
Fix some comments while at it.
* automake.in (handle_dist): Include it suing the 'verbatim'
function.
* Makefile.am (dist_am_DATA): Adjust.
* t/distcheck-configure-flags-am.sh: Remove obsolete grepping
checks, that would cause the test to fails spuriously.
* t/distcheck-configure-flags.sh: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
commit cbcab9ca31a167fc65f095914441d66069965ff1
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 18:41:09 2012 +0200
[ng] distcheck: move in its own '*.am' fragment
* lib/am/distdir.am: From here ...
* lib/am/distcheck.am: ... to here. That is especially useful because
all of the 'distcheck' target has to be protected by a if '%?TOPDIR_P%'
conditional (since the 'distcheck' target must only be present in the
top-level makefile), so that we can now remove this overly long
conditional from this fragment ...
* automake.in (handle_dist): ... and simply limiting the inclusion
of it to when '$reldir' is '.'.
* Makefile.am (dist_am_DATA): Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b71160a4a1420c0e68a10b71af8d0990ab3d781d
Merge: 5468d52 ae1f40f
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 17:44:57 2012 +0200
Merge branch 'master' into ng/master
* master:
automake: remove an unused local variable
distcheck: more resilient against possible failures
cleanup: remove almost-unused global var 'am_relative_dir'
Signed-off-by: Stefano Lattarini <address@hidden>
commit 5468d520e4ea5546047dca93e89787e774b96534
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 17:34:46 2012 +0200
[ng] tests: reorganize gettext tests a bit
* t/gettext.sh: Move checks about PR/381 ...
* t/gettext-pr381.sh: ... to this new test.
* t/gettext.sh: Move checks about config.rpath requirement ...
* t/gettext-config-rpath.sh: ... to this new test.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 1a0bf99a6d153629e605eb49cadfbbc6e6dbd7d8
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 17:15:54 2012 +0200
[ng] tests: avoid spurious failure in a gettext test
* t/gettext2.sh: Here, remove obsolete grepping checks in favor
of more modern ones.
* t/gettext.sh: Likewise. This doesn't fix any failure, but
makes the test more reliable.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 8b4d5ce79c187282fa39b53e4127af1a2c141a0a
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 16:50:32 2012 +0200
[ng] tests: adjust weaknesses in the gettext tests
* t/gettext-macros.sh (m4/mk-dirp.m4): Define 'AM_PROG_MKDIR_P' rather
than 'AM_MKDIR_P', and in doing so, use 'AC_PROG_MKDIR_P' rather than
'AC_MKDIR_P'.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 4100c2baf7640c77d31578edb5001545a25cbec1
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 16:29:58 2012 +0200
[ng] distcheck: --with-included-gettext: with a variable, not a transform
This is mostly a preparatory refactoring in view of future changes.
* automake.in (handle_dist): Define the new internal variable
'am.dist.handle-gettext' to "yes" if the package uses gettext,
to the empty string otherwise. This takes over the role of the
transform 'GETTEXT', which has thus been removed.
* lib/am/distdir.am (distcheck): Adjust to rely on the new variable
instead than of the removed transform.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b8bc481684e9d3f602a2028a6fbe021aae60dacf
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 10 16:00:42 2012 +0200
[ng] disthook: with an internal variable, not a transform
This is mostly a preparatory refactoring in view of future changes.
* automake.in (handle_dist): Define the internal variable
'am.dist.handle-distcheck-hook' to "yes" if a user-defined
'distcheck-hook' rule, to the empty string otherwise. This
take over the role of the transform 'DISTCHECK-HOOK', which
has thus been removed.
* lib/am/distdir.am (distcheck): Adjust to rely on the new
variable instead than of the removed transform.
* t/distcheck-hook.sh: Remove obsolete or obsolescent grepping
checks.
* t/distcheck-hook2.sh: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
automake.in | 13 +--
lib/am/distcheck.mk | 153 +++++++++++++++++++++++++
lib/am/distdir.am | 143 -----------------------
t/distcheck-configure-flags-am.sh | 5 -
t/distcheck-configure-flags.sh | 2 -
t/distcheck-hook.sh | 4 -
t/distcheck-hook2.sh | 7 -
t/{gcj4.sh => gettext-config-rpath.sh} | 40 +++----
t/gettext-macros.sh | 2 +-
t/{confh-subdir-clean.sh => gettext-pr381.sh} | 31 +++--
t/gettext.sh | 47 ++------
t/gettext2.sh | 4 +-
13 files changed, 208 insertions(+), 244 deletions(-)
create mode 100644 lib/am/distcheck.mk
copy t/{gcj4.sh => gettext-config-rpath.sh} (54%)
copy t/{confh-subdir-clean.sh => gettext-pr381.sh} (65%)
diff --git a/Makefile.am b/Makefile.am
index 42ed0f1..24b75d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -195,6 +195,7 @@ dist_am_DATA = \
lib/am/header-vars.mk \
lib/am/tags.mk \
lib/am/dejagnu.mk \
+ lib/am/distcheck.mk \
lib/am/compile.am \
lib/am/configure.am \
lib/am/data.am \
diff --git a/automake.in b/automake.in
index 153c246..c1806ab 100644
--- a/automake.in
+++ b/automake.in
@@ -3277,14 +3277,10 @@ sub handle_dist ()
# after this point, so disallow it, for extra safety.
$handle_dist_run = 1;
- # Scan EXTRA_DIST to see if we need to distribute anything from a
- # subdir. If so, add it to the list. I didn't want to do this
- # originally, but there were so many requests that I finally
- # relented.
- my $extra_dist = var ('EXTRA_DIST');
-
- $transform{'DISTCHECK-HOOK'} = !! rule 'distcheck-hook';
- $transform{'GETTEXT'} = $seen_gettext && !$seen_gettext_external;
+ define_variable ('am.dist.handle-distcheck-hook', INTERNAL,
+ rule ('distcheck-hook') ? 'yes' : '');
+ define_variable ('am.dist.handle-gettext', INTERNAL,
+ $seen_gettext && !$seen_gettext_external ? 'yes' : '');
# If the target 'dist-hook' exists, make sure it is run. This
# allows users to do random weird things to the distribution
@@ -3301,6 +3297,7 @@ sub handle_dist ()
%transform,
FILENAME_FILTER => $filename_filter,
'DIST-COMMON' => "@dist_common");
+ verbatim ('distcheck') if $relative_dir eq '.';
}
diff --git a/lib/am/distcheck.mk b/lib/am/distcheck.mk
new file mode 100644
index 0000000..b358997
--- /dev/null
+++ b/lib/am/distcheck.mk
@@ -0,0 +1,153 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright (C) 2001-2012 Free Software Foundation, Inc.
+
+## 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 2, 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.
+
+# ---------------------------- #
+# Checking the distribution. #
+# ---------------------------- #
+
+ifdef SUBDIRS
+AM_RECURSIVE_TARGETS += distcheck
+endif
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+.PHONY: distcheck
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+## Make the new source tree read-only. Distributions ought to work in
+## this case. However, make the top-level directory writable so we
+## can make our new subdirs.
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
+## Undo the write access.
+ chmod a-w $(distdir)
+## With GNU make, the following command will be executed even with "make -n",
+## due to the presence of '$(MAKE)'. That is normally all well (and '$(MAKE)'
+## is necessary for things like parallel distcheck), but here we don't want
+## execution. To avoid MAKEFLAGS parsing hassles, use a witness file that a
+## non-'-n' run would have just created.
+ test -d $(distdir)/_build || exit 0; \
+## Compute the absolute path of '_inst'. Strip any leading DOS drive
+## to allow DESTDIR installations. Otherwise "$(DESTDIR)$(prefix)" would
+## expand to "c:/temp/am-dc-5668/c:/src/package/package-1.0/_inst".
+ dc_install_base=`cd $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
+## We will attempt a DESTDIR install in $dc_destdir. We don't
+## create this directory under $dc_install_base, because it would
+## create very long directory names.
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ $(if $(am.dist.handle-distcheck-hook),&& $(MAKE) distcheck-hook) \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(if $(am.dist.handle-gettext),--with-included-gettext) \
+## Additional flags for configure. Keep this last in the configure
+## invocation so the developer and user can override previous options,
+## and let the user's flags take precedence over the developer's ones.
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) \
+ && $(MAKE) dvi \
+ && $(MAKE) check \
+ && $(MAKE) install \
+ && $(MAKE) installcheck \
+ && $(MAKE) uninstall \
+ && $(MAKE) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+## Make sure the package has proper DESTDIR support (we could not test this
+## in the previous install/installcheck/uninstall test, because it's reasonable
+## for installcheck to fail in a DESTDIR install).
+## We make the '$dc_install_base' read-only because this is where files
+## with missing DESTDIR support are likely to be installed.
+ && chmod -R a-w "$$dc_install_base" \
+## The logic here is quite convoluted because we must clean $dc_destdir
+## whatever happens (it won't be erased by the next run of distcheck like
+## $(distdir) is).
+ && ({ \
+## Build the directory, so we can cd into it even if "make install"
+## didn't create it. Use mkdir, not $(MKDIR_P) because we want to
+## fail if the directory already exists (PR/413).
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) dist \
+## Make sure to remove the dists we created in the test build directory.
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) distcleancheck
+ $(am__post_remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+
+# Define distuninstallcheck_listfiles and distuninstallcheck separately
+# from distcheck, so that they can be overridden by the user.
+.PHONY: distuninstallcheck
+distuninstallcheck_listfiles = find . -type f -print
+# The 'dir' file (created by install-info) might still exist after
+# uninstall, so we must be prepared to account for it. The following
+# check is not 100% strict, but is definitely good enough, and even
+# accounts for overridden $(infodir).
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distuninstallcheck:
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ cd '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+
+# Define '$(distcleancheck_listfiles)' and 'distcleancheck' separately
+# from distcheck, so that they can be overridden by the user.
+ifeq ($(call am.vars.is-undef,distcleancheck_listfiles),yes)
+ distcleancheck_listfiles := find . -type f -print
+endif
+.PHONY: distcleancheck
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index efe576c..2a08ad9 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -388,146 +388,3 @@ dist dist-all:
$(am__post_remove_distdir)
endif %?TOPDIR_P%
-
-
-## ------------------------- ##
-## Checking a distribution. ##
-## ------------------------- ##
-
-
-if %?TOPDIR_P%
-if %?SUBDIRS%
-AM_RECURSIVE_TARGETS += distcheck
-endif %?SUBDIRS%
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-.PHONY: distcheck
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lz*) \
- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-## Make the new source tree read-only. Distributions ought to work in
-## this case. However, make the top-level directory writable so we
-## can make our new subdirs.
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
-## Undo the write access.
- chmod a-w $(distdir)
-## With GNU make, the following command will be executed even with "make -n",
-## due to the presence of '$(MAKE)'. That is normally all well (and '$(MAKE)'
-## is necessary for things like parallel distcheck), but here we don't want
-## execution. To avoid MAKEFLAGS parsing hassles, use a witness file that a
-## non-'-n' run would have just created.
- test -d $(distdir)/_build || exit 0; \
-## Compute the absolute path of '_inst'. Strip any leading DOS drive
-## to allow DESTDIR installations. Otherwise "$(DESTDIR)$(prefix)" would
-## expand to "c:/temp/am-dc-5668/c:/src/package/package-1.0/_inst".
- dc_install_base=`cd $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
-## We will attempt a DESTDIR install in $dc_destdir. We don't
-## create this directory under $dc_install_base, because it would
-## create very long directory names.
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-?DISTCHECK-HOOK? && $(MAKE) distcheck-hook \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-?GETTEXT? --with-included-gettext \
-## Additional flags for configure. Keep this last in the configure
-## invocation so the developer and user can override previous options,
-## and let the user's flags take precedence over the developer's ones.
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) \
- && $(MAKE) dvi \
- && $(MAKE) check \
- && $(MAKE) install \
- && $(MAKE) installcheck \
- && $(MAKE) uninstall \
- && $(MAKE) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
-## Make sure the package has proper DESTDIR support (we could not test this
-## in the previous install/installcheck/uninstall test, because it's reasonable
-## for installcheck to fail in a DESTDIR install).
-## We make the '$dc_install_base' read-only because this is where files
-## with missing DESTDIR support are likely to be installed.
- && chmod -R a-w "$$dc_install_base" \
-## The logic here is quite convoluted because we must clean $dc_destdir
-## whatever happens (it won't be erased by the next run of distcheck like
-## $(distdir) is).
- && ({ \
-## Build the directory, so we can cd into it even if "make install"
-## didn't create it. Use mkdir, not $(MKDIR_P) because we want to
-## fail if the directory already exists (PR/413).
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) DESTDIR="$$dc_destdir" install \
- && $(MAKE) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) dist \
-## Make sure to remove the dists we created in the test build directory.
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) distcleancheck
- $(am__post_remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-
-## Define distuninstallcheck_listfiles and distuninstallcheck separately
-## from distcheck, so that they can be overridden by the user.
-.PHONY: distuninstallcheck
-distuninstallcheck_listfiles = find . -type f -print
-## The 'dir' file (created by install-info) might still exist after
-## uninstall, so we must be prepared to account for it. The following
-## check is not 100% strict, but is definitely good enough, and even
-## accounts for overridden $(infodir).
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
- '$$(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- cd '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-
-## Define distcleancheck_listfiles and distcleancheck separately
-## from distcheck, so that they can be overridden by the user.
-.PHONY: distcleancheck
-distcleancheck_listfiles = find . -type f -print
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-endif %?TOPDIR_P%
diff --git a/t/distcheck-configure-flags-am.sh
b/t/distcheck-configure-flags-am.sh
index 828199e..f01a9b2 100755
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -37,11 +37,6 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-$FGREP '$(AM_DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-grep 'DISTCHECK_CONFIGURE_FLAGS.*AM_DISTCHECK_CONFIGURE_FLAGS' Makefile.in \
- && exit 1
-
$AUTOCONF
./configure --enable-success sentence='it works :-)'
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index fdec9a5..998c43d 100755
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -32,8 +32,6 @@ unset sentence || :
$ACLOCAL
$AUTOMAKE
-$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
-
$AUTOCONF
./configure --enable-success sentence='it works :-)'
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index ef64805..f806e4b 100755
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
@@ -35,10 +35,6 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP 'distcheck-hook' Makefile.in
-$FGREP '$(MAKE) distcheck-hook' Makefile.in
-grep '^distcheck-hook:' Makefile.in
-
$AUTOCONF
./configure
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index 7c7352b..de4c155 100755
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
@@ -60,13 +60,6 @@ $AUTOMAKE
$AUTOCONF
cd ..
-# For debugging.
-$FGREP 'distcheck-hook' Makefile.in subpkg/Makefile.in
-
-$FGREP 'distcheck-hook' subpkg/Makefile.in && exit 1
-$FGREP '$(MAKE) distcheck-hook' Makefile.in
-grep '^distcheck-hook:' Makefile.in
-
./configure
$MAKE
diff --git a/t/gcj4.sh b/t/gettext-config-rpath.sh
similarity index 54%
copy from t/gcj4.sh
copy to t/gettext-config-rpath.sh
index 299e1c1..613ee82 100755
--- a/t/gcj4.sh
+++ b/t/gettext-config-rpath.sh
@@ -14,36 +14,32 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure dependency tracking works for Java.
+# Check the config.rpath requirement.
-required=gcj
+required='gettext'
. ./defs || exit 1
cat >> configure.ac << 'END'
-AM_PROG_GCJ
+AM_GNU_GETTEXT
+# config.rpath is required by versions >= 0.14.3.
+AM_GNU_GETTEXT_VERSION([0.14.3])
AC_OUTPUT
END
-cat > Makefile.am << 'END'
-bin_PROGRAMS = convert
-convert_SOURCES = convert.java
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure >stdout || { cat stdout; exit 1; }
-cat stdout
+echo 'SUBDIRS = po intl' >Makefile.am
+mkdir po intl
-# Configure must be checking the dependency style of gcj ...
-grep 'dependency style of gcj' stdout >filt
-cat filt
+# If aclocal fails here, it may be that gettext is too old to provide
+# AM_GNU_GETTEXT_VERSION. Similarly, autopoint will fail if it's
+# from an older version. If gettext is too old to provide autopoint,
+# this will fail as well, so we're safe here.
+if ! $ACLOCAL && autopoint -n; then
+ skip_ "too old gettext installation"
+fi
-# ... only once.
-test $(wc -l < filt) = 1
-
-# Accept any outcome but 'none'
-# (at the time of writing it should be gcc or gcc3).
-grep -v none filt
+AUTOMAKE_fails --add-missing
+grep '^configure\.ac:.*required file.*config.rpath' stderr
+: > config.rpath
+$AUTOMAKE
:
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 1d94dad..fad34a9 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -80,7 +80,7 @@ echo "export ACLOCAL_PATH" >> get.sh
# Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P'
# m4 macro. So we need the following to avoid spurious errors.
-echo 'AC_DEFUN([AM_MKDIR_P], [AC_MKDIR_P(address@hidden)])' >> m4/mk-dirp.m4
+echo 'AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P(address@hidden)])'
>m4/am-mkdirp.m4
. ./get.sh
diff --git a/t/confh-subdir-clean.sh b/t/gettext-pr381.sh
similarity index 65%
copy from t/confh-subdir-clean.sh
copy to t/gettext-pr381.sh
index 75024f6..1bb6320 100755
--- a/t/confh-subdir-clean.sh
+++ b/t/gettext-pr381.sh
@@ -14,27 +14,32 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure config headers in subdirectories are cleaned.
+# Automake gettext support: regression check for PR/381:
+# 'SUBDIRS = po intl' must not be required if 'po/' doesn't exist.
+required='gettext'
. ./defs || exit 1
cat >> configure.ac << 'END'
-AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
+AM_GNU_GETTEXT
AC_OUTPUT
END
-touch Makefile.am
-mkdir sub
-
$ACLOCAL
-$AUTOCONF
-touch sub/config.hin
+
+: > config.guess
+: > config.rpath
+: > config.sub
+
+test ! -d po # Sanity check.
+mkdir sub
+echo 'SUBDIRS = sub' > Makefile.am
$AUTOMAKE
-./configure
-test -f sub/stamp-h1
-$MAKE clean
-test -f sub/stamp-h1
-$MAKE distclean
-test -f sub/stamp-h1 && exit 1
+
+# Still, SUBDIRS must be defined.
+
+: > Makefile.am
+AUTOMAKE_fails
+grep '^configure\.ac:.*AM_GNU_GETTEXT used but SUBDIRS not defined' stderr
:
diff --git a/t/gettext.sh b/t/gettext.sh
index a1925f1..5f89b61 100755
--- a/t/gettext.sh
+++ b/t/gettext.sh
@@ -19,37 +19,17 @@
required='gettext'
. ./defs || exit 1
-cat >>configure.ac <<END
+cat >> configure.ac << 'END'
AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.3])
AC_OUTPUT
END
-: >Makefile.am
+: > Makefile.am
+: > config.rpath
mkdir po intl
-# config.rpath is required by versions >= 0.14.3. We try to verify
-# this requirement, but only when we find we have a working and recent
-# gettext installation.
-
-# If aclocal fails here, it may be that gettext is too old to
-# provide AM_GNU_GETTEXT_VERSION.
-if $ACLOCAL; then
-
- # autopoint will fail if it's from an older version.
- # If gettext is too old to provide autopoint, this will
- # fail as well, so we're safe here.
- if autopoint -n; then
- AUTOMAKE_fails --add-missing
- grep 'required.*config.rpath' stderr
- fi
-fi
-
-: >config.rpath
-sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.int
-mv -f configure.int configure.ac
-
$ACLOCAL
+$AUTOCONF
# po/ and intl/ are required.
@@ -70,18 +50,9 @@ echo 'SUBDIRS = po intl' >Makefile.am
$AUTOMAKE --add-missing
# Make sure distcheck runs './configure --with-included-gettext'.
-grep 'with-included-gettext' Makefile.in
-
-# 'SUBDIRS = po intl' isn't required if po/ doesn't exist.
-# PR/381.
+./configure
+echo distdir: > po/Makefile
+echo distdir: > intl/Makefile
+$MAKE -n distcheck | grep '.*--with-included-gettext'
-rmdir po
-mkdir sub
-echo 'SUBDIRS = sub' >Makefile.am
-$AUTOMAKE
-
-# Still, SUBDIRS must be defined.
-
-: >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
+:
diff --git a/t/gettext2.sh b/t/gettext2.sh
index f3d91b0..960ef36 100755
--- a/t/gettext2.sh
+++ b/t/gettext2.sh
@@ -29,6 +29,7 @@ END
mkdir foo po
$ACLOCAL
+$AUTOCONF
# config.rpath is required.
: >config.rpath
@@ -49,7 +50,8 @@ $AUTOMAKE --add-missing
# Don't try running ./configure --with-included-gettext if the
# user is using AM_GNU_GETTEXT([external]).
-grep 'with-included-gettext' Makefile.in && exit 1
+./configure
+$MAKE -n distcheck | grep 'with-included-gettext' && exit 1
# intl/ isn't wanted with AM_GNU_GETTEXT([external]).
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-831-gbcade0f,
Stefano Lattarini <=