зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1881545 - Move nl_langinfo and CODESET check from js/src/old-configure.in to js/moz.configure r=glandium
This makes codeset.m4 unused, so also remove it while we're at it. Differential Revision: https://phabricator.services.mozilla.com/D202450
This commit is contained in:
Родитель
16e12507f5
Коммит
ec606a05bb
|
@ -6,7 +6,6 @@ dnl
|
|||
builtin(include, build/autoconf/hooks.m4)dnl
|
||||
builtin(include, build/autoconf/config.status.m4)dnl
|
||||
builtin(include, build/autoconf/toolchain.m4)dnl
|
||||
builtin(include, build/autoconf/codeset.m4)dnl
|
||||
builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||
builtin(include, build/autoconf/mozheader.m4)dnl
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
# codeset.m4 serial AM1 (gettext-0.10.40)
|
||||
dnl Copyright (C) 2000-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
|
||||
dnl Public License, this file may be distributed as part of a program
|
||||
dnl that contains a configuration script generated by Autoconf, under
|
||||
dnl the same distribution terms as the rest of that program.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_DEFUN([AM_LANGINFO_CODESET],
|
||||
[
|
||||
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
||||
[AC_TRY_LINK([#include <langinfo.h>],
|
||||
[char* cs = nl_langinfo(CODESET);],
|
||||
am_cv_langinfo_codeset=yes,
|
||||
am_cv_langinfo_codeset=no)
|
||||
])
|
||||
if test $am_cv_langinfo_codeset = yes; then
|
||||
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
||||
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
||||
HAVE_LANGINFO_CODESET=1
|
||||
fi
|
||||
AC_SUBST(HAVE_LANGINFO_CODESET)
|
||||
])
|
|
@ -1354,6 +1354,16 @@ with only_when(compile_environment & depends(target.os)(lambda os: os != "WINNT"
|
|||
set_define("HAVE_PTHREAD_GET_NAME_NP", check_symbol("pthread_get_name_np"))
|
||||
set_define("HAVE_STRERROR", check_symbol("strerror"))
|
||||
|
||||
set_config(
|
||||
"HAVE_LANGINFO_CODESET",
|
||||
try_link(
|
||||
includes=["langinfo.h"],
|
||||
body="char* cs = nl_langinfo(CODESET);",
|
||||
check_msg="for nl_langinfo and CODESET",
|
||||
when=building_with_gnu_cc,
|
||||
),
|
||||
)
|
||||
|
||||
@depends(check_symbol("__cxa_demangle", language="C++"), moz_debug, dmd)
|
||||
def demangle_symbols(cxa_demangle, moz_debug, dmd):
|
||||
# Demangle only for debug or DMD builds
|
||||
|
|
|
@ -6,7 +6,6 @@ dnl
|
|||
builtin(include, ../../build/autoconf/hooks.m4)dnl
|
||||
builtin(include, ../../build/autoconf/config.status.m4)dnl
|
||||
builtin(include, ../../build/autoconf/toolchain.m4)dnl
|
||||
builtin(include, ../../build/autoconf/codeset.m4)dnl
|
||||
builtin(include, ../../build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, ../../build/autoconf/mozprog.m4)dnl
|
||||
builtin(include, ../../build/autoconf/mozheader.m4)dnl
|
||||
|
|
|
@ -601,14 +601,6 @@ then
|
|||
fi
|
||||
|
||||
|
||||
dnl Checks for nl_langinfo functions.
|
||||
dnl ========================================================
|
||||
|
||||
AM_LANGINFO_CODESET
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
dnl ===================================================================
|
||||
dnl ========================================================
|
||||
dnl Put your C++ language/feature checks below
|
||||
dnl ========================================================
|
||||
|
|
Загрузка…
Ссылка в новой задаче