svn commit: samba r15871 - in branches/SAMBA_4_0/source/lib/charset: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-24 18:23:57 +0000 (Wed, 24 May 2006)
New Revision: 15871

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15871

Log:
Fix systems with native iconv

Modified:
   branches/SAMBA_4_0/source/lib/charset/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/config.m4	2006-05-24 17:57:54 UTC (rev 15870)
+++ branches/SAMBA_4_0/source/lib/charset/config.m4	2006-05-24 18:23:57 UTC (rev 15871)
@@ -49,7 +49,7 @@
 ])
 
 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 @@
 	fi
 	
 	SMB_CHECK_ICONV_DIR($i, [
-		ICONV_FOUND=yes; 
+		ICONV_FOUND=yes
 		ICONV_CPPFLAGS="$CPPFLAGS"
 		ICONV_LIBS="$LIBS"
 		ICONV_LDFLAGS="$LDFLAGS"