r19442: 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

diff --git a/source/lib/replace/config.mk b/source/lib/replace/config.mk
index ff80955ffe1f0ebcd99740d0c7c9734d508de012..7103facd5116766d9d3604dfed2c79cc6d1829e5 100644 (file)
--- a/source/lib/replace/config.mk
+++ b/source/lib/replace/config.mk
@@ -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

diff --git a/source/lib/replace/system/iconv.h b/source/lib/replace/system/iconv.h
index f01d135dd18864d2861555c58cbff05a77580a9c..abc2d6f4e1b3b6d158a8cbff5c0098977a635982 100644 (file)
--- a/source/lib/replace/system/iconv.h
+++ b/source/lib/replace/system/iconv.h
@@ -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 */