gnokii-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnokii] 01/03: Add codeset.m4 to m4/ to prevent build failure with gett


From: Pawel Kot
Subject: [gnokii] 01/03: Add codeset.m4 to m4/ to prevent build failure with gettext >= 0.20
Date: Thu, 2 Jan 2020 07:24:27 -0500 (EST)

pkot pushed a commit to branch master
in repository gnokii.

commit 4dd198d121ca366c9881d022a56394c2e56936d0
Author: Pawel Kot <address@hidden>
Date:   Thu Jan 2 13:13:45 2020 +0100

    Add codeset.m4 to m4/ to prevent build failure with gettext >= 0.20
    
    Add codeset.m4 to m4/ as it is missing from gettext distribution from
    version 0.20.
    
    Fixes: https://savannah.nongnu.org/bugs/?57509
---
 ChangeLog     |  2 ++
 m4/codeset.m4 | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b2016d7..77c1362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,8 @@
  * build system updates
     o rename configure.in as configure.ac since the former name is
       deprecated                                    (Daniele Forsi)
+    o add local copy of codeset.m4 as it is gone from gettext 0.20
+      distribution                                      (PaweĊ‚ Kot)
  * pcsc driver updates
     o drop support for model=pcsc that was deprecated in libgnokii
       0.6.28 and renamed as model=APDU              (Daniele Forsi)
diff --git a/m4/codeset.m4 b/m4/codeset.m4
new file mode 100644
index 0000000..da1b2ae
--- /dev/null
+++ b/m4/codeset.m4
@@ -0,0 +1,25 @@
+# codeset.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
+dnl 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 From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <langinfo.h>]],
+          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
+       [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).])
+  fi
+])
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]