1
Description: Drop -Werror from AM_INIT_AUTOMAKE and handle parallel tests
2
This avoids problems with the version of Gnulib used here causing warnings
3
from Automake 1.13. This patch can be dropped at the next upstream
5
Author: Colin Watson <cjwatson@debian.org>
7
Last-Update: 2013-06-03
10
===================================================================
14
# Initialise and check we're in the correct directory.
15
AC_INIT([man-db], [2.6.3], [cjwatson@debian.org])
16
AC_CONFIG_AUX_DIR([tools])
17
-AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override -Werror foreign dist-xz no-dist-gzip])
18
+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-override foreign dist-xz no-dist-gzip parallel-tests])
20
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
22
Index: b/man/Rules.man
23
===================================================================
28
export top_builddir LINGUA EGREP
30
-TESTS_ENVIRONMENT = @SHELL@ $(top_srcdir)/man/check-man
31
+LOG_COMPILER = @SHELL@ $(top_srcdir)/man/check-man
32
TESTS = $(man1_MANS) $(man5_MANS) $(man8_MANS)
35
Index: b/src/tests/Makefile.am
36
===================================================================
37
--- a/src/tests/Makefile.am
38
+++ b/src/tests/Makefile.am
40
## along with man-db; if not, write to the Free Software Foundation,
41
## Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
43
-TESTS_ENVIRONMENT = PATH=..:$$PATH DBTYPE=$(DBTYPE) \
44
- top_builddir=$(top_builddir) \
45
- @LOCALCHARSET_TESTS_ENVIRONMENT@ $(SHELL)
46
+TESTS_ENVIRONMENT = PATH=..:$$PATH; export PATH; \
47
+ DBTYPE=$(DBTYPE); export DBTYPE; \
48
+ top_builddir=$(top_builddir); export top_builddir; \
49
+ @LOCALCHARSET_TESTS_ENVIRONMENT@; export CHARSETALIASDIR;
50
+# Each test must use the configure-detected shell, not necessarily /bin/sh.
51
+AM_LOG_FLAGS = $(SHELL)