X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0ea6f486d933d85fc030c9a3971d853eda71fabf..6622816efff2d6634ac5e1e4b45d9f23dffbf03f:/configure.in diff --git a/configure.in b/configure.in index 73b4e430..6230f475 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.59) -RSYNC_VERSION=3.0.6dev +RSYNC_VERSION=3.0.6 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -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).])