From 49c2407141e85d9e3ce2a507db4c2facb7cd74b5 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 14 Feb 2009 07:50:09 -0800
Subject: [PATCH] Added --disable-iconv-open option for configure to turn off
 all use of the iconv_open() function.  Implies --disable-iconv (which turns
 off the --iconv option).  Fixes bug #6107.

---
 configure.in | 11 ++++++++++-
 rsync.h      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index a6698a73..d03bc4ed 100644
--- a/configure.in
+++ b/configure.in
@@ -564,10 +564,19 @@ if test $ac_cv_func_getpgrp = yes; then
     AC_FUNC_GETPGRP
 fi
 
+AC_ARG_ENABLE(iconv-open,
+    AC_HELP_STRING([--disable-iconv-open],
+	    [disable all use of iconv_open() function]),
+    [], [enable_iconv_open=$ac_cv_func_iconv_open])
+
+if test x"$enable_iconv_open" != x"no"; then
+    AC_DEFINE(USE_ICONV_OPEN, 1, [Define to 1 if you want rsync to make use of iconv_open()])
+fi
+
 AC_ARG_ENABLE(iconv,
     AC_HELP_STRING([--disable-iconv],
 	    [disable rsync's --iconv option]),
-    [], [enable_iconv=$ac_cv_func_iconv_open])
+    [], [enable_iconv=$enable_iconv_open])
 AH_TEMPLATE([ICONV_OPTION],
 [Define if you want the --iconv option.  Specifing a value will set the
 default iconv setting (a NULL means no --iconv processing by default).])
diff --git a/rsync.h b/rsync.h
index 70da4866..be7cf8a5 100644
--- a/rsync.h
+++ b/rsync.h
@@ -416,7 +416,7 @@ enum delret {
 # include <limits.h>
 #endif
 
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if defined USE_ICONV_OPEN && defined HAVE_ICONV_H
 #include <iconv.h>
 #ifndef ICONV_CONST
 #define ICONV_CONST
-- 
2.34.1