From 4ff6e11df26f4504c30fd5f2e981296e83c74dd9 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Wed, 27 Feb 2008 11:46:26 +0000
Subject: 24609: try to be safe about using libiconv

---
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 8a56a4c05..335eccbfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -824,8 +824,13 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then
       [ #include <iconv.h> ])
   fi
 fi
+AH_TEMPLATE([ICONV_FROM_LIBICONV],
+[Define to 1 if iconv() is linked from libiconv])
 if test "x$ac_found_iconv" = xyes; then
   AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+  AC_TRY_LINK([#include <iconv.h>],
+    [int myversion = _libiconv_version],
+    AC_DEFINE(ICONV_FROM_LIBICONV), )
 fi
 
 dnl Check if iconv uses const in prototype declaration
-- 
cgit 1.4.1