Support cross-compilation of <wctype.h>.

* m4/wctype.m4 (gl_WCTYPE_H): Fix improper nesting in
AC_CACHE_CHECK.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index df3cc32a6ce700a5688ad90a334112d6cc8020c6..db8e106eb0898b88e7fb33d201a288ad436c97a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-07  Eric Blake  <ebb9@byu.net>
+
+       Support cross-compilation of <wctype.h>.
+       * m4/wctype.m4 (gl_WCTYPE_H): Fix improper nesting in
+       AC_CACHE_CHECK.
+
 2008-05-06  Soren Hansen  <soren@ubuntu.com>  (tiny change)
 
        * build-aux/vc-list-files: Add support for bzr.

diff --git a/m4/wctype.m4 b/m4/wctype.m4
index 7c6718c3e14e38fde512e3ce67d02b06aa39255f..1ace2f6d73b1c4d5941b7f8ba6094ead7ee4c0cb 100644 (file)
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 dnl Written by Paul Eggert.
 
+#serial 2
 AC_DEFUN([gl_WCTYPE_H],
 [
   AC_REQUIRE([AC_PROG_CC])
@@ -41,15 +42,13 @@ AC_DEFUN([gl_WCTYPE_H],
                       #include <wchar.h>
                       #include <wctype.h>
                       int main () { return iswprint ('x') == 0; }],
-            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
-        ],
-        [
-          AC_TRY_COMPILE([#include <stdlib.h>
+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
+            [AC_TRY_COMPILE([#include <stdlib.h>
                           #if __GNU_LIBRARY__ == 1
                           Linux libc5 i18n is broken.
-                          #endif],
-            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
-        ])
+                          #endif], [],
+              [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
+        ])])
       if test $gl_cv_func_iswcntrl_works = yes; then
         WCTYPE_H=
       fi