Project

General

Profile

Bug #185 » 0044-Update-.m4-files-from-gettext-0.23.patch

Marko Lindqvist, 01/18/2024 09:48 PM

View differences:

m4/gettext.m4
# gettext.m4 serial 78 (gettext-0.22.4)
dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc.
# gettext.m4 serial 79 (gettext-0.23)
dnl Copyright (C) 1995-2014, 2016, 2018-2024 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.
......
AC_LIB_LINKFLAGS_BODY([intl])
AC_CACHE_CHECK([for GNU gettext in libintl],
[$gt_func_gnugettext_libintl],
[gt_save_CPPFLAGS="$CPPFLAGS"
[gt_saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
gt_saved_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv.
AC_LINK_IFELSE(
......
eval "$gt_func_gnugettext_libintl=yes"
])
fi
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"])
CPPFLAGS="$gt_saved_CPPFLAGS"
LIBS="$gt_saved_LIBS"])
fi
dnl If an already present or preinstalled GNU gettext() is found,
......
dnl Define localedir_c and localedir_c_make.
dnl Find the final value of localedir.
gt_save_prefix="${prefix}"
gt_save_datarootdir="${datarootdir}"
gt_save_localedir="${localedir}"
gt_saved_prefix="${prefix}"
gt_saved_datarootdir="${datarootdir}"
gt_saved_localedir="${localedir}"
dnl Unfortunately, prefix gets only finally determined at the end of
dnl configure.
if test "X$prefix" = "XNONE"; then
......
eval datarootdir="$datarootdir"
eval localedir="$localedir"
gl_BUILD_TO_HOST([localedir])
localedir="${gt_save_localedir}"
datarootdir="${gt_save_datarootdir}"
prefix="${gt_save_prefix}"
localedir="${gt_saved_localedir}"
datarootdir="${gt_saved_datarootdir}"
prefix="${gt_saved_prefix}"
])
m4/intlmacosx.m4
# intlmacosx.m4 serial 9 (gettext-0.22.3)
dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc.
# intlmacosx.m4 serial 10 (gettext-0.23)
dnl Copyright (C) 2004-2014, 2016, 2019-2024 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 Check for API introduced in Mac OS X 10.4.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
[gt_saved_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
......
[[CFPreferencesCopyAppValue(NULL, NULL)]])],
[gt_cv_func_CFPreferencesCopyAppValue=yes],
[gt_cv_func_CFPreferencesCopyAppValue=no])
LIBS="$gt_save_LIBS"])
LIBS="$gt_saved_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.])
......
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"
[gt_saved_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
......
[[CFLocaleCopyPreferredLanguages();]])],
[gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
[gt_cv_func_CFLocaleCopyPreferredLanguages=no])
LIBS="$gt_save_LIBS"])
LIBS="$gt_saved_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.])
(2-2/2)