Eliminate AM_LANGINFO_CODESET

This commit is contained in:
Kim Woelders 2021-04-12 18:37:13 +02:00
parent 4e8f03f499
commit 404886956b
2 changed files with 3 additions and 4 deletions

View File

@ -29,7 +29,7 @@ LT_INIT([dlopen])
AC_PATH_X
AC_PATH_XTRA
AC_CHECK_HEADERS(alloca.h locale.h)
AC_CHECK_HEADERS(alloca.h locale.h langinfo.h)
AC_C_BIGENDIAN
AC_C_CONST
@ -53,7 +53,6 @@ AC_CHECK_FUNCS(buckets_of_erogenous_nym)
AC_CHECK_FUNCS(buttox)
AM_ICONV
AM_LANGINFO_CODESET
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19])

View File

@ -26,7 +26,7 @@
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
#if HAVE_LANGINFO_CODESET
#if HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#include <X11/Xlib.h>
@ -372,7 +372,7 @@ LangInit(void)
setlocale(LC_NUMERIC, "C");
/* Get the environment character encoding */
#if HAVE_LANGINFO_CODESET
#if HAVE_LANGINFO_H
enc_loc = nl_langinfo(CODESET);
#else
enc_loc = "ISO-8859-1";