svn commit: samba r19442 - in branches/SAMBA_4_0/source/lib/replace: . system

[metze at samba.org]

Author: metze
Date: 2006-10-21 10:12:39 +0000 (Sat, 21 Oct 2006)
New Revision: 19442

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

Log:
this real cause of the failures on *BSD came from the missing
ICONV dependency and not from a broken configure test
and incorrect ifdef's.

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/config.mk
   branches/SAMBA_4_0/source/lib/replace/system/iconv.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.mk	2006-10-21 09:46:12 UTC (rev 19441)
+++ branches/SAMBA_4_0/source/lib/replace/config.mk	2006-10-21 10:12:39 UTC (rev 19442)
@@ -1,4 +1,6 @@
 [BINARY::REPLACE]
 OBJ_FILES = test/testsuite.o test/os2_delete.o
-PRIVATE_DEPENDENCIES = LIBREPLACE
+PRIVATE_DEPENDENCIES = \
+		LIBREPLACE \
+		ICONV
 INSTALLDIR = TORTUREDIR/LOCAL

Modified: branches/SAMBA_4_0/source/lib/replace/system/iconv.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/iconv.h	2006-10-21 09:46:12 UTC (rev 19441)
+++ branches/SAMBA_4_0/source/lib/replace/system/iconv.h	2006-10-21 10:12:39 UTC (rev 19442)
@@ -35,11 +35,11 @@
 #endif
 
 #ifdef HAVE_NATIVE_ICONV
-#if defined(HAVE_ICONV_H)
+#if defined(HAVE_ICONV)
 #include <iconv.h>
-#elif defined(HAVE_GICONV_H)
+#elif defined(HAVE_GICONV)
 #include <giconv.h>
-#elif defined(HAVE_BICONV_H)
+#elif defined(HAVE_BICONV)
 #include <biconv.h>
 #endif
 #endif /* HAVE_NATIVE_ICONV */