From 380a2aa18e0c048cfefa1cb4102dfbf902a1962b Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 18 Feb 2014 15:20:49 +0100
Subject: common: Require an installed libiconv.

* common/utf8conv.c: Remove dynload.h.
(load_libiconv): Remove.  Remove all calls to it.
--

The iconv functions are standard feature on most systems and in any
case libiconv can be used to provide the functions.  The old code used
to dlopen iconv.dll on Windows.  This goes back to GnuPG-1 which was
designed as a one-binary program without any hard dependencies.
GnuPG2 however demands a lot of libraries anyway and thus there is no
more need for the fragile code to load a possible wrong version of
iconv.dll at runtime.
---
 configure.ac | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4abeeb007..dc4d1ae36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1168,6 +1168,7 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
 AM_ICONV
 
 
+
 #
 # Check for gettext
 #
@@ -1785,6 +1786,17 @@ if test "$have_npth" = "no"; then
 ***]])
 fi
 
+if test "$am_func_iconv" != yes; then
+    die=yes
+    AC_MSG_NOTICE([[
+***
+*** The system does not provide a working iconv function.  Please
+*** install a suitable library; for example GNU Libiconv which is
+*** available at:
+***   http://ftp.gnu.org/gnu/libiconv/
+***]])
+fi
+
 if test "$die" = "yes"; then
     AC_MSG_ERROR([[
 ***
-- 
cgit v1.2.3