Another round of merges from 3.0:

>Change error message displayed when --without-libiconv is used as
>an argument to configure.  Closes bug 468.
(This used to be commit 4b73ba7df1764b47aae8b22980efdb05d1639e57)

diff --git a/source3/configure.in b/source3/configure.in
index 0cf34bc9a72752c2e6faaf5f683593b9475c098a..b981313c9ad11c5d0f2c3443e5a0ce75c1c8fafc 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1573,7 +1573,7 @@ AC_ARG_WITH(libiconv,
 [  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
 [
   if test "$withval" = "no" ; then
-    AC_MSG_ERROR(I won't take no for an answer)
+    AC_MSG_ERROR([argument to --with-libiconv must be a directory])
   else
      if test "$withval" != "yes" ; then
        ICONV_PATH_SPEC=yes