[PATCH 10/11] duplocale: Fix Android build of duplocale-tests

[Kevin Cernekee]

* modules/duplocale-tests (Depends-on): Add langinfo, as the header
is included by test-duplocale.c (but not by duplocale.c).
* modules/duplocale-tests (configure.ac): Check for monetary.h.
* tests/test-duplocale.c: Skip test if monetary.h is absent.
* doc/posix-headers/monetary.texi: Add Android to the list of
platforms missing monetary.h.
---
 ChangeLog                       | 8 ++++++++
 doc/posix-headers/monetary.texi | 2 +-
 modules/duplocale-tests         | 2 ++
 tests/test-duplocale.c          | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ed3de23809f..be46fe9c1388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,14 @@
        * lib/signal.in.h: Add Android to the list of platforms that declare
        pthread_sigmask() in <pthread.h> instead of <signal.h>.
 
+       duplocale: Fix Android build of duplocale-tests
+       * modules/duplocale-tests (Depends-on): Add langinfo, as the header
+       is included by test-duplocale.c (but not by duplocale.c).
+       * modules/duplocale-tests (configure.ac): Check for monetary.h.
+       * tests/test-duplocale.c: Skip test if monetary.h is absent.
+       * doc/posix-headers/monetary.texi: Add Android to the list of
+       platforms missing monetary.h.
+
 2015-02-08  Daiki Ueno  <address@hidden>
 
        uniname/unimame-tests: don't link with -lunistring
diff --git a/doc/posix-headers/monetary.texi b/doc/posix-headers/monetary.texi
index 95170eb14945..baf2cd61f0d8 100644
--- a/doc/posix-headers/monetary.texi
+++ b/doc/posix-headers/monetary.texi
@@ -13,5 +13,5 @@ Portability problems not fixed by Gnulib:
 @itemize
 @item
 This header file is missing on some platforms:
-NetBSD 3.0, OpenBSD 3.8, Minix 3.1.8, Cygwin, mingw, MSVC 9, BeOS.
+NetBSD 3.0, OpenBSD 3.8, Minix 3.1.8, Cygwin, mingw, MSVC 9, BeOS, Android.
 @end itemize
diff --git a/modules/duplocale-tests b/modules/duplocale-tests
index af9dc9889d7f..9cd9d44f38d2 100644
--- a/modules/duplocale-tests
+++ b/modules/duplocale-tests
@@ -4,9 +4,11 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+langinfo
 
 configure.ac:
 AC_CHECK_FUNCS_ONCE([duplocale])
+AC_CHECK_HEADERS([monetary.h])
 
 Makefile.am:
 TESTS += test-duplocale
diff --git a/tests/test-duplocale.c b/tests/test-duplocale.c
index f5da517bf3f8..18913f1b8b7d 100644
--- a/tests/test-duplocale.c
+++ b/tests/test-duplocale.c
@@ -20,7 +20,7 @@
 
 #include <locale.h>
 
-#if HAVE_DUPLOCALE
+#if HAVE_DUPLOCALE && HAVE_MONETARY_H
 
 #include "signature.h"
 SIGNATURE_CHECK (duplocale, locale_t, (locale_t));
-- 
2.2.0.rc0.207.ga3a616c