[PATCH]: GnuLib cross compilation problem

[Yoann Vandoorselaere]

Hi,

Attached is a patch that fixes btowc.m4, mbrtowc.m4, wcrtomb.m4,
wcsrtombs.m4, and wctob.m4, so that they don't error out when cross
compiling.

Regards,

-- 
Yoann Vandoorselaere <yoan...@prelude-ids.com>
PreludeIDS Technologies

diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 64ff829..065684e 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -30,7 +30,7 @@ changequote(,)dnl
           *)     gl_cv_func_btowc_eof="guessing yes" ;;
         esac
 changequote([,])dnl
-        if test $LOCALE_FR != none; then
+        if test $LOCALE_FR != none && test $cross_compiling = no; then
           AC_TRY_RUN([
 #include <locale.h>
 #include <stdio.h>
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index b6276b2..f094dc3 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -105,7 +105,7 @@ changequote(,)dnl
         *)    gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_JA != none; then
+      if test $LOCALE_JA != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
@@ -153,7 +153,7 @@ changequote(,)dnl
         *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_ZH_CN != none; then
+      if test $LOCALE_ZH_CN != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
@@ -204,7 +204,7 @@ changequote(,)dnl
         *)    gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
+      if test $LOCALE_FR_UTF8 != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
@@ -254,7 +254,7 @@ changequote(,)dnl
         *)                gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+      if (test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none) && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
@@ -321,7 +321,7 @@ changequote(,)dnl
         *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_ZH_CN != none; then
+      if test $LOCALE_ZH_CN != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index 22d9433..64564a4 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -35,7 +35,7 @@ changequote(,)dnl
           *)               gl_cv_func_wcrtomb_retval="guessing yes" ;;
         esac
 changequote([,])dnl
-        if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+        if (test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none) && test $cross_compiling = no; then
           AC_TRY_RUN([
 #include <locale.h>
 #include <stdio.h>
diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4
index 829168e..a1e6c95 100644
--- a/m4/wcsrtombs.m4
+++ b/m4/wcsrtombs.m4
@@ -61,7 +61,7 @@ changequote(,)dnl
         *)    gl_cv_func_wcsrtombs_termination="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR != none; then
+      if test $LOCALE_FR != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <stdlib.h>
@@ -115,7 +115,7 @@ changequote(,)dnl
         *)            gl_cv_func_wcsrtombs_null="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR != none; then
+      if test $LOCALE_FR != none && test $cross_compiling = no; then
         AC_TRY_RUN([
 #include <locale.h>
 #include <stdlib.h>
diff --git a/m4/wctob.m4 b/m4/wctob.m4
index 40cb709..f11f67f 100644
--- a/m4/wctob.m4
+++ b/m4/wctob.m4
@@ -34,7 +34,7 @@ changequote(,)dnl
           *) gl_cv_func_wctob_works="guessing yes" ;;
         esac
 changequote([,])dnl
-        if test $LOCALE_FR != none; then
+        if test $LOCALE_FR != none && test $cross_compiling = no; then
           AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>