diff options
| -rw-r--r-- | gettext-runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/Makefile.am | 2 | ||||
| -rw-r--r-- | gettext-runtime/m4/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-runtime/m4/gettext.m4 | 15 |
4 files changed, 21 insertions, 7 deletions
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 72f646e..1c9343b 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,5 +1,10 @@ 2005-08-28 Bruno Haible <bruno@clisp.org> + * Makefile.am (config.h_vms): Remove setting of HAVE_MALLOC_H, + HAVE_NL_TYPES_H. + +2005-08-28 Bruno Haible <bruno@clisp.org> + * Makefile.am (intl/libgnuintl.h_vms, intl/libgnuintl.h.msvc-static, intl/libgnuintl.h.msvc-shared): Remove the IN_LIBGLOCALE conditional. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 77db5b1..db58922 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -70,12 +70,10 @@ config.h_vms: config.h.in ../version.sh -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \ -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \ -e 's/#undef HAVE_LONG_LONG$$/#define HAVE_LONG_LONG 1/' \ - -e 's/#undef HAVE_MALLOC_H$$/#define HAVE_MALLOC_H 1/' \ -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \ -e 's/#undef HAVE_MEMORY_H$$/#define HAVE_MEMORY_H 1/' \ -e 's/#undef HAVE_MMAP$$/#define HAVE_MMAP 1/' \ -e 's/#undef HAVE_MUNMAP$$/#define HAVE_MUNMAP 1/' \ - -e 's/#undef HAVE_NL_TYPES_H$$/#define HAVE_NL_TYPES_H 1/' \ -e 's/#undef HAVE_POSIX_PRINTF$$/#define HAVE_POSIX_PRINTF 1/' \ -e 's/#undef HAVE_PTRDIFF_T$$/#define HAVE_PTRDIFF_T 1/' \ -e 's/#undef HAVE_PUTENV$$/#define HAVE_PUTENV 1/' \ diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index b7bcfdc..71c47cd 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,5 +1,11 @@ 2005-08-28 Bruno Haible <bruno@clisp.org> + * gettext.m4 (AM_INTL_SUBDIR): Remove AC_HEADER_STDC, AC_TYPE_OFF_T + tests. Remove tests for locale.h, nl_types.h, malloc.h. + (gt_INTL_SUBDIR_CORE): Add test for __builtin_expect. + +2005-08-28 Bruno Haible <bruno@clisp.org> + * gettext.m4 (gt_INTL_SUBDIR_CORE): New macro, extracted from AM_INTL_SUBDIR. (AM_INTL_SUBDIR): Require it. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index d953c00..455aa36 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 42 (gettext-0.15) +# gettext.m4 serial 43 (gettext-0.15) dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2005. dnl Macro to add for using GNU gettext. @@ -361,9 +361,7 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([gl_VISIBILITY])dnl AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl AC_REQUIRE([gt_TYPE_WCHAR_T])dnl @@ -379,7 +377,7 @@ AC_DEFUN([AM_INTL_SUBDIR], [AC_DEFINE([ptrdiff_t], [long], [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) ]) - AC_CHECK_HEADERS([locale.h nl_types.h malloc.h stddef.h stdlib.h string.h]) + AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) dnl Use the _snprintf function only if it is declared (because on NetBSD it @@ -495,6 +493,13 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_LOCK])dnl + + AC_TRY_COMPILE( + [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], + [], + [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, + [Define to 1 if the compiler understands __builtin_expect.])]) + AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ stpcpy strcasecmp strdup strtoul tsearch __argz_count __argz_stringify \ |