From 404886956b39c9840000b3381301edd539afbc91 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Mon, 12 Apr 2021 18:37:13 +0200
Subject: [PATCH] Eliminate AM_LANGINFO_CODESET

---
 configure.ac | 3 +--
 src/lang.c   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4ddacf26..2dd35941 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/src/lang.c b/src/lang.c
index a20421b2..2b9f5d27 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -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";