From: Bruno Haible Date: Mon, 19 Jun 2023 09:52:23 +0000 (+0200) Subject: build: Simplify. X-Git-Tag: v0.23~430 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5997a0a590235f77dd0bbf01e9d223fc8cea37c;p=thirdparty%2Fgettext.git build: Simplify. * gettext-runtime/intl/configure.ac: Inline the gt_INTL_SUBDIR_CORE macro. * gettext-runtime/m4/intl.m4: Remove file. * gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove it. --- diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac index 9a80546ef..2f2a6f7f0 100644 --- a/gettext-runtime/intl/configure.ac +++ b/gettext-runtime/intl/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-runtime directory of GNU gettext -dnl Copyright (C) 1995-2016, 2018-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2023 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -102,7 +102,59 @@ AM_CONDITIONAL([PRELOADABLE_LIBINTL], dnl Checks for header files, functions and declarations. gl_INIT -gt_INTL_SUBDIR_CORE +dnl Checks for the core files of the intl subdirectory: +dnl dcigettext.c +dnl eval-plural.h +dnl explodename.c +dnl finddomain.c +dnl gettextP.h +dnl gmo.h +dnl hash-string.h hash-string.c +dnl l10nflist.c +dnl libgnuintl.h.in (except the *printf stuff) +dnl loadinfo.h +dnl loadmsgcat.c +dnl localealias.c +dnl log.c +dnl plural-exp.h plural-exp.c +dnl plural.y +AC_C_INLINE +AC_TYPE_SIZE_T +gl_AC_HEADER_STDINT_H +AC_FUNC_ALLOCA +AC_FUNC_MMAP +gt_INTDIV0 +gl_LOCK + +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[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([inttypes.h unistd.h sys/param.h]) +AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ + stpcpy strcasecmp uselocale __fsetlocking]) + +dnl Use the *_unlocked functions only if they are declared. +dnl (because some of them were defined without being declared in Solaris +dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built +dnl on Solaris 2.5.1 to run on Solaris 2.6). +AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include ]) + +AM_ICONV + +dnl intl/plural.c is generated from intl/plural.y. It requires bison, +dnl because plural.y uses bison specific features. It requires at least +dnl bison-3.0 for %precedence. +dnl bison is only needed for the maintainer (who touches plural.y). But in +dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put +dnl the rule in general Makefile. Now, some people carelessly touch the +dnl files or have a broken "make" program, hence the plural.c rule will +dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not +dnl present or too old. +gl_PROG_BISON([INTLBISON], [3.0]) gl_PRINTF_POSITIONS case "$gl_cv_func_printf_positions" in diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index 362b7a635..a024b344f 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -24,7 +24,6 @@ gettext.m4 \ glibc2.m4 \ iconv.m4 \ intdiv0.m4 \ -intl.m4 \ intlmacosx.m4 \ inttypes_h.m4 \ nls.m4 \ diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4 deleted file mode 100644 index cae6a2190..000000000 --- a/gettext-runtime/m4/intl.m4 +++ /dev/null @@ -1,78 +0,0 @@ -# intl.m4 serial 54 (gettext-0.23) -dnl Copyright (C) 1995-2014, 2016-2023 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. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Lesser General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Lesser General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2009. - -AC_PREREQ([2.60]) - -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], -[ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[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([inttypes.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp uselocale __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include ]) - - AM_ICONV - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-3.0 for %precedence. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - gl_PROG_BISON([INTLBISON], [3.0]) -])