From: Bruno Haible Date: Mon, 19 Jun 2023 11:22:19 +0000 (+0200) Subject: build: Remove redundant .m4 file. X-Git-Tag: v0.23~425 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d01dfc1ee9de110e92b8b5df63023d6f3b1123;p=thirdparty%2Fgettext.git build: Remove redundant .m4 file. * gettext-runtime/m4/intlmacosx.m4: Remove file. * gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove it. * Makefile.am (distcheck-hook): Don't check it. * gettext-tools/m4/Makefile.am (aclocal_DATA): Take it from the gettext-runtime/gnulib-m4/ directory. --- diff --git a/Makefile.am b/Makefile.am index 7c19d594f..d67f92fb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,6 @@ distcheck-hook: cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sin $(srcdir)/gettext-tools/examples/po/remove-potcdate.sin cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4 cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4 - cmp -s $(srcdir)/gettext-runtime/m4/intlmacosx.m4 $(srcdir)/gettext-tools/gnulib-m4/intlmacosx.m4 cmp -s $(srcdir)/gettext-runtime/m4/nls.m4 $(srcdir)/gettext-tools/gnulib-m4/nls.m4 cmp -s $(srcdir)/gettext-runtime/m4/po.m4 $(srcdir)/gettext-tools/gnulib-m4/po.m4 cmp -s $(srcdir)/gettext-runtime/m4/progtest.m4 $(srcdir)/gettext-tools/gnulib-m4/progtest.m4 diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index b624c0a24..1f2277f0f 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST = README \ build-to-host.m4 \ gettext.m4 \ glibc2.m4 \ -intlmacosx.m4 \ nls.m4 \ po.m4 \ progtest.m4 diff --git a/gettext-runtime/m4/intlmacosx.m4 b/gettext-runtime/m4/intlmacosx.m4 deleted file mode 100644 index 81eefd750..000000000 --- a/gettext-runtime/m4/intlmacosx.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# intlmacosx.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019-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 Checks for special options needed on Mac OS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in Mac OS X 10.4. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFPreferencesCopyAppValue(NULL, NULL)]])], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent, - dnl because in macOS 10.13.4 it has the following behaviour: - dnl When two or more languages are specified in the - dnl "System Preferences > Language & Region > Preferred Languages" panel, - dnl it returns en_CC where CC is the territory (even when English is not among - dnl the preferred languages!). What we want instead is what - dnl CFLocaleCopyCurrent returned in earlier macOS releases and what - dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the - dnl first among the preferred languages and CC is the territory. - AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFLocaleCopyPreferredLanguages();]])], - [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], - [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], - [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ - || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 26f3637fd..469de03a6 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -22,12 +22,12 @@ aclocaldir = @aclocaldir@ aclocal_DATA = \ ../../gettext-runtime/gnulib-m4/host-cpu-c-abi.m4 \ ../../gettext-runtime/gnulib-m4/iconv.m4 \ + ../../gettext-runtime/gnulib-m4/intlmacosx.m4 \ ../../gettext-runtime/gnulib-m4/lib-ld.m4 \ ../../gettext-runtime/gnulib-m4/lib-link.m4 \ ../../gettext-runtime/gnulib-m4/lib-prefix.m4 \ ../../gettext-runtime/m4/build-to-host.m4 \ ../../gettext-runtime/m4/gettext.m4 \ - ../../gettext-runtime/m4/intlmacosx.m4 \ ../../gettext-runtime/m4/nls.m4 \ ../../gettext-runtime/m4/po.m4 \ ../../gettext-runtime/m4/progtest.m4