r15871: Fix systems with native iconv

(This used to be commit 8ce292bdf3589e5d054bf9a534846c29dfc71124)

diff --git a/source4/lib/charset/config.m4 b/source4/lib/charset/config.m4
index 2e20f7ab3791d94904a7433fae5e92c5ba16024e..5d37a781fd934fbddc900329876724bb859f8ef0 100644 (file)
--- a/source4/lib/charset/config.m4
+++ b/source4/lib/charset/config.m4
@@ -49,7 +49,7 @@ AC_ARG_WITH(libiconv,
 ])
 
 if test x$ICONV_FOUND = xno; then
-       SMB_CHECK_ICONV(iconv.h,[ICONV_FOUND=yes])
+       SMB_CHECK_ICONV(iconv.h,[AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) ICONV_FOUND=yes])
 fi
 
 for i in $LOOK_DIRS ; do
@@ -58,7 +58,7 @@ for i in $LOOK_DIRS ; do
        fi
        
        SMB_CHECK_ICONV_DIR($i, [
-               ICONV_FOUND=yes; 
+               ICONV_FOUND=yes
                ICONV_CPPFLAGS="$CPPFLAGS"
                ICONV_LIBS="$LIBS"
                ICONV_LDFLAGS="$LDFLAGS"