about summary refs log tree commit diff
path: root/configure.ac
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-02-27 11:46:26 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-02-27 11:46:26 +0000
commit4ff6e11df26f4504c30fd5f2e981296e83c74dd9 (patch)
tree0fef9fc7e63d9ddcd685add5e24f21bf95d32f3d /configure.ac
parente21bd541a286cd3946a3951e3dad88a0ef46d530 (diff)
downloadzsh-4ff6e11df26f4504c30fd5f2e981296e83c74dd9.tar.gz
zsh-4ff6e11df26f4504c30fd5f2e981296e83c74dd9.tar.xz
zsh-4ff6e11df26f4504c30fd5f2e981296e83c74dd9.zip
24609: try to be safe about using libiconv
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
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