From: Bruno Haible Date: Mon, 19 Apr 2004 12:00:21 +0000 (+0000) Subject: jm_ -> gl_ X-Git-Tag: v0.14.2~268 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=085be4ce8b2e5d6e2481a3805612c91fa95dbd5f;p=thirdparty%2Fgettext.git jm_ -> gl_ --- diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index b4c746405..364de4738 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,24 @@ +2004-04-19 Bruno Haible + + * error.m4: Change jm_ to gl_ in AC_DEFINE'd names. Update all uses. + +2004-04-19 Bruno Haible + + * mbrtowc.m4: Change jm_ to gl_ in cache variables as well. + +2004-04-18 Jim Meyering + + * mbswidth.m4: Change jm_ to gl_ in AC_DEFINE'd names. Update all uses. + * mkdtemp.m4: Likewise. + * unlocked-io.m4: Likewise. + * quotearg.m4: Likewise. + +2004-03-18 Paul Eggert + Bruno Haible + + * mbswidth.m4 (gl_MBSWIDTH): Also test whether declares + mbswidth. + 2004-03-08 Bruno Haible * csharpcomp.m4 (gt_CSHARPCOMP): Test whether csc is not the chicken diff --git a/gettext-tools/m4/error.m4 b/gettext-tools/m4/error.m4 index eb97cfb9e..c8039f41d 100644 --- a/gettext-tools/m4/error.m4 +++ b/gettext-tools/m4/error.m4 @@ -1,4 +1,4 @@ -# error.m4 serial 2 (gettext-0.12) +# error.m4 serial 3 (gettext-0.15) dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -18,12 +18,12 @@ AC_DEFUN([gt_FUNC_ERROR_AT_LINE], AC_DEFINE(HAVE_ERROR_AT_LINE, 1, [Define to 1 if you have the functions error() and error_at_line().]) else - jm_PREREQ_ERROR + gl_PREREQ_ERROR fi ]) # Prerequisites of lib/error.c. -AC_DEFUN([jm_PREREQ_ERROR], +AC_DEFUN([gl_PREREQ_ERROR], [ AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_FUNC_VPRINTF]) diff --git a/gettext-tools/m4/mbrtowc.m4 b/gettext-tools/m4/mbrtowc.m4 index 21e9daaba..3d8768ecb 100644 --- a/gettext-tools/m4/mbrtowc.m4 +++ b/gettext-tools/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 5 -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# mbrtowc.m4 serial 7 +dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -8,19 +8,19 @@ dnl the same distribution terms as the rest of that program. dnl From Paul Eggert -dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with +dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere. -AC_DEFUN([jm_FUNC_MBRTOWC], +AC_DEFUN([gl_FUNC_MBRTOWC], [ AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], - jm_cv_func_mbrtowc, + gl_cv_func_mbrtowc, [AC_TRY_LINK( [#include ], [mbstate_t state; return ! (sizeof state && mbrtowc);], - jm_cv_func_mbrtowc=yes, - jm_cv_func_mbrtowc=no)]) - if test $jm_cv_func_mbrtowc = yes; then + gl_cv_func_mbrtowc=yes, + gl_cv_func_mbrtowc=no)]) + if test $gl_cv_func_mbrtowc = yes; then AC_DEFINE(HAVE_MBRTOWC, 1, [Define to 1 if mbrtowc and mbstate_t are properly declared.]) fi diff --git a/gettext-tools/m4/mbswidth.m4 b/gettext-tools/m4/mbswidth.m4 index d7981ca39..f61be107a 100644 --- a/gettext-tools/m4/mbswidth.m4 +++ b/gettext-tools/m4/mbswidth.m4 @@ -1,4 +1,4 @@ -#serial 9 +#serial 11 dnl autoconf tests required for use of mbswidth.c dnl From Bruno Haible. @@ -8,7 +8,7 @@ AC_DEFUN([gl_MBSWIDTH], AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit) AC_CHECK_FUNCS(iswcntrl wcwidth) - jm_FUNC_MBRTOWC + gl_FUNC_MBRTOWC AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth, [AC_TRY_COMPILE([ @@ -32,5 +32,24 @@ AC_DEFUN([gl_MBSWIDTH], AC_DEFINE_UNQUOTED(HAVE_DECL_WCWIDTH, $ac_val, [Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise.]) + dnl UnixWare 7.1.1 has a declaration of a function mbswidth() + dnl that clashes with ours. + AC_CACHE_CHECK([whether mbswidth is declared in ], + ac_cv_have_decl_mbswidth, + [AC_TRY_COMPILE([ +#if HAVE_WCHAR_H +# include +#endif +], [ + char *p = (char *) mbswidth; +], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)]) + if test $ac_cv_have_decl_mbswidth = yes; then + ac_val=1 + else + ac_val=0 + fi + AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val, + [Define to 1 if you have a declaration of mbswidth() in , and to 0 otherwise.]) + AC_TYPE_MBSTATE_T ]) diff --git a/gettext-tools/m4/mkdtemp.m4 b/gettext-tools/m4/mkdtemp.m4 index a729b44fe..f64fe11f6 100644 --- a/gettext-tools/m4/mkdtemp.m4 +++ b/gettext-tools/m4/mkdtemp.m4 @@ -1,4 +1,4 @@ -# mkdtemp.m4 serial 2 +# mkdtemp.m4 serial 3 dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -20,6 +20,6 @@ AC_DEFUN([gl_PREREQ_MKDTEMP], AC_REQUIRE([AC_HEADER_STAT]) AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h) AC_CHECK_HEADERS(time.h) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) AC_CHECK_FUNCS(gettimeofday) ]) diff --git a/gettext-tools/m4/quotearg.m4 b/gettext-tools/m4/quotearg.m4 index 2fba109f1..aa4a3d147 100644 --- a/gettext-tools/m4/quotearg.m4 +++ b/gettext-tools/m4/quotearg.m4 @@ -1,4 +1,4 @@ -# quotearg.m4 serial 1 +# quotearg.m4 serial 2 dnl Copyright (C) 2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -12,5 +12,5 @@ AC_DEFUN([gl_QUOTEARG], AC_CHECK_HEADERS_ONCE(wchar.h wctype.h) AC_CHECK_FUNCS_ONCE(iswprint mbsinit) AC_TYPE_MBSTATE_T - jm_FUNC_MBRTOWC + gl_FUNC_MBRTOWC ]) diff --git a/gettext-tools/m4/unlocked-io.m4 b/gettext-tools/m4/unlocked-io.m4 index f8e98f1d1..cd1c5f4ef 100644 --- a/gettext-tools/m4/unlocked-io.m4 +++ b/gettext-tools/m4/unlocked-io.m4 @@ -1,4 +1,4 @@ -#serial 8 -*- autoconf -*- +#serial 9 dnl From Jim Meyering. dnl @@ -8,7 +8,7 @@ dnl (because some of them were declared in Solaris 2.5.1 but were removed dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run dnl on Solaris 2.6). -AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO], +AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [ dnl Persuade glibc and Solaris to declare dnl fgets_unlocked(), fputs_unlocked() etc.