summaryrefslogtreecommitdiff
path: root/gnulib-m4/wctob.m4
diff options
context:
space:
mode:
authorStephen Kitt <skitt@debian.org>2016-05-27 10:11:04 +0200
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:28:33 +0100
commit752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch)
treeb4a428f847a963738faaf24c8eff070fdb03a3a5 /gnulib-m4/wctob.m4
parent9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff)
parenta9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff)
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'gnulib-m4/wctob.m4')
-rw-r--r--gnulib-m4/wctob.m447
1 files changed, 17 insertions, 30 deletions
diff --git a/gnulib-m4/wctob.m4 b/gnulib-m4/wctob.m4
index 501dc4ab..3af3cc7b 100644
--- a/gnulib-m4/wctob.m4
+++ b/gnulib-m4/wctob.m4
@@ -1,5 +1,5 @@
-# wctob.m4 serial 10
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# wctob.m4 serial 5
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -10,10 +10,11 @@ AC_DEFUN([gl_FUNC_WCTOB],
AC_CHECK_FUNCS_ONCE([wctob])
if test $ac_cv_func_wctob = no; then
- HAVE_WCTOB=0
HAVE_DECL_WCTOB=0
+ gl_REPLACE_WCHAR_H
+ AC_LIBOBJ([wctob])
+ gl_PREREQ_WCTOB
else
- HAVE_WCTOB=1
dnl Solaris 9 has the wctob() function but it does not work.
dnl Cygwin 1.7.2 has the wctob() function but it clobbers caller-owned
@@ -37,16 +38,8 @@ changequote(,)dnl
changequote([,])dnl
case "$host_os" in
cygwin*)
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ AC_TRY_RUN([
#include <locale.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
#include <wchar.h>
register long global __asm__ ("%ebx");
@@ -61,24 +54,13 @@ int main ()
if (global != 0x12345678)
return 2;
return 0;
-}]])],
- [:],
- [gl_cv_func_wctob_works=no],
- [:])
+}], [:], [gl_cv_func_wctob_works=no], [:])
;;
esac
if test "$gl_cv_func_wctob_works" != no && test $LOCALE_FR != none; then
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ AC_TRY_RUN([
#include <locale.h>
#include <string.h>
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
- <wchar.h>.
- BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
- included before <wchar.h>. */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
#include <wchar.h>
int main ()
{
@@ -91,7 +73,7 @@ int main ()
return 1;
}
return 0;
-}]])],
+}],
[gl_cv_func_wctob_works=yes],
[gl_cv_func_wctob_works=no],
[:])
@@ -101,10 +83,14 @@ int main ()
*yes) ;;
*) REPLACE_WCTOB=1 ;;
esac
- if test $REPLACE_WCTOB = 0; then
+ if test $REPLACE_WCTOB = 1; then
+ gl_REPLACE_WCHAR_H
+ AC_LIBOBJ([wctob])
+ gl_PREREQ_WCTOB
+ else
dnl IRIX 6.5 has the wctob() function but does not declare it.
- AC_CHECK_DECLS([wctob], [], [], [[
+ AC_CHECK_DECLS([wctob], [], [], [
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
@@ -113,9 +99,10 @@ int main ()
#include <stdio.h>
#include <time.h>
#include <wchar.h>
-]])
+])
if test $ac_cv_have_decl_wctob != yes; then
HAVE_DECL_WCTOB=0
+ gl_REPLACE_WCHAR_H
fi
fi
fi