27 files changed, 54 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b56236d5..06e37d20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun  6 11:11:36 BST 2013  Colin Watson  <cjwatson@debian.org>
+
+	* configure.ac: Set MANDIR_LAYOUT using AC_SUBST as well as
+	  AC_DEFINE/AC_DEFINE_UNQUOTED.
+	* src/tests/Makefile.am (TESTS_ENVIRONMENT): Export MANDIR_LAYOUT.
+	* src/tests/testlib.sh (skip): New function.
+	* src/tests/man-3: Skip unless the GNU layout is in use.
+
 Thu Jun  6 10:57:17 BST 2013  Colin Watson  <cjwatson@debian.org>
 
 	* src/tests/man-1, src/tests/man-2, src/tests/man-3,
diff --git a/Makefile.in b/Makefile.in
index 00e0096d..e15a1260 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -949,6 +949,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/configure b/configure
index 1ef4a1b8..f0a0a67f 100755
--- a/configure
+++ b/configure
@@ -1450,6 +1450,7 @@ GL_COND_LIBTOOL_TRUE
 LEXLIB
 LEX_OUTPUT_ROOT
 LEX
+MANDIR_LAYOUT
 LIBCOMPRESS
 unlzip
 unxz
@@ -17142,6 +17143,7 @@ cat >>confdefs.h <<_ACEOF
 #define MANDIR_LAYOUT "$enableval"
 _ACEOF
 
+	 MANDIR_LAYOUT="$enableval"
 else
   case $host in
 		*-gnu)          mandirs=GNU;;
@@ -17158,15 +17160,18 @@ $as_echo "$as_me: Using $mandirs hierarchy organization" >&6;}
 #define MANDIR_LAYOUT "$mandirs"
 _ACEOF
 
+		MANDIR_LAYOUT="$mandirs"
 	 else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Allowing any hierarchy organization" >&5
 $as_echo "$as_me: Allowing any hierarchy organization" >&6;}
 		$as_echo "#define MANDIR_LAYOUT \"\"" >>confdefs.h
 
+		MANDIR_LAYOUT=
 	 fi
 fi
 
 
+
 # Check for various header files and associated libraries.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
diff --git a/configure.ac b/configure.ac
index d2a0aa8b..bb4cfb2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,7 +382,8 @@ AC_ARG_ENABLE([mandirs],
 [AS_HELP_STRING([--enable-mandirs=OS], [select manual page hierarchy organization (GNU, HPUX, IRIX, Solaris, BSD)])],
 	[AC_MSG_NOTICE([Using $enableval hierarchy organization(s)])
 	 AC_DEFINE_UNQUOTED([MANDIR_LAYOUT], ["$enableval"],
-			    [Define to the manual page hierarchy organization(s) in use.])],
+			    [Define to the manual page hierarchy organization(s) in use.])
+	 MANDIR_LAYOUT="$enableval"],
 	[case $host in
 		*-gnu)          mandirs=GNU;;
 		*-hpux*)        mandirs=HPUX;;
@@ -394,10 +395,13 @@ AC_ARG_ENABLE([mandirs],
 	 if test -n "$mandirs"; then
 		AC_MSG_NOTICE([Using $mandirs hierarchy organization])
 		AC_DEFINE_UNQUOTED([MANDIR_LAYOUT], ["$mandirs"])
+		MANDIR_LAYOUT="$mandirs"
 	 else
 		AC_MSG_NOTICE([Allowing any hierarchy organization])
 		AC_DEFINE([MANDIR_LAYOUT], [""])
+		MANDIR_LAYOUT=
 	 fi])
+AC_SUBST([MANDIR_LAYOUT])
 
 # Check for various header files and associated libraries.
 AC_ISC_POSIX
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 77386142..c78d7e77 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -863,6 +863,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 6cff20b6..a0580cab 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -994,6 +994,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 463260c9..c3671d68 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -951,6 +951,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/libdb/Makefile.in b/libdb/Makefile.in
index 3f702f74..89533b24 100644
--- a/libdb/Makefile.in
+++ b/libdb/Makefile.in
@@ -947,6 +947,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/Makefile.in b/man/Makefile.in
index f76ed92c..02d69734 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1131,6 +1131,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/da/Makefile.in b/man/da/Makefile.in
index 737a4984..7c55c7da 100644
--- a/man/da/Makefile.in
+++ b/man/da/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index e32bb819..be53f573 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/es/Makefile.in b/man/es/Makefile.in
index 4d750557..8c2956d8 100644
--- a/man/es/Makefile.in
+++ b/man/es/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index 82a46538..179ff52f 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/id/Makefile.in b/man/id/Makefile.in
index 5ad8b8be..53274351 100644
--- a/man/id/Makefile.in
+++ b/man/id/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/it/Makefile.in b/man/it/Makefile.in
index 73140cf6..4e137e4f 100644
--- a/man/it/Makefile.in
+++ b/man/it/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index d30ed5dd..5efba6b6 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in
index a036bc3c..8db1763c 100644
--- a/man/nl/Makefile.in
+++ b/man/nl/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in
index b15624a4..55fa96fe 100644
--- a/man/pl/Makefile.in
+++ b/man/pl/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/po4a/Makefile.in b/man/po4a/Makefile.in
index 182c9710..8aecdb4d 100644
--- a/man/po4a/Makefile.in
+++ b/man/po4a/Makefile.in
@@ -860,6 +860,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index 2c86fadb..3ac2e35b 100644
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -1072,6 +1072,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/manual/Makefile.in b/manual/Makefile.in
index 32383dab..30969f5b 100644
--- a/manual/Makefile.in
+++ b/manual/Makefile.in
@@ -863,6 +863,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/src/Makefile.in b/src/Makefile.in
index 4d961957..1f86fbe5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1026,6 +1026,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 08a1a301..0eab313a 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -20,6 +20,7 @@
 
 TESTS_ENVIRONMENT = PATH=..:$$PATH; export PATH; \
 		    DBTYPE=$(DBTYPE); export DBTYPE; \
+		    MANDIR_LAYOUT=$(MANDIR_LAYOUT); export MANDIR_LAYOUT; \
 		    top_builddir=$(top_builddir); export top_builddir; \
 		    @LOCALCHARSET_TESTS_ENVIRONMENT@; export CHARSETALIASDIR;
 # Each test must use the configure-detected shell, not necessarily /bin/sh.
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 83902055..e8d37a16 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1065,6 +1065,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@
@@ -1425,6 +1426,7 @@ vgrind = @vgrind@
 xz = @xz@
 TESTS_ENVIRONMENT = PATH=..:$$PATH; export PATH; \
 		    DBTYPE=$(DBTYPE); export DBTYPE; \
+		    MANDIR_LAYOUT=$(MANDIR_LAYOUT); export MANDIR_LAYOUT; \
 		    top_builddir=$(top_builddir); export top_builddir; \
 		    @LOCALCHARSET_TESTS_ENVIRONMENT@; export CHARSETALIASDIR;
 
diff --git a/src/tests/man-3 b/src/tests/man-3
index bfd1cc6f..c4e35619 100755
--- a/src/tests/man-3
+++ b/src/tests/man-3
@@ -6,6 +6,14 @@
 : ${srcdir=.}
 . "$srcdir/testlib.sh"
 
+case $MANDIR_LAYOUT in
+	""|GNU)
+		;;
+	*)
+		skip "only applicable to GNU layout"
+		;;
+esac
+
 : ${MAN=man}
 
 init
diff --git a/src/tests/testlib.sh b/src/tests/testlib.sh
index c0b86aa2..2d42c35a 100644
--- a/src/tests/testlib.sh
+++ b/src/tests/testlib.sh
@@ -79,6 +79,11 @@ expect_pass () {
 	fi
 }
 
+skip () {
+	echo "  SKIP: $1"
+	exit 77
+}
+
 finish () {
 	case $failures in
 		0)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4cd13a34..12d84bd0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -867,6 +867,7 @@ LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANDIR_LAYOUT = @MANDIR_LAYOUT@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBDIRS = @MAN_SUBDIRS@
 MKDIR_P = @MKDIR_P@