From 2e468ee5df6371799d627f78245417fd61c5741d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 21 Oct 2006 10:12:39 +0000 Subject: 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 (This used to be commit 3df2cb1ea82dae7395d3d19ba73f97dad26bb86b) --- source4/lib/replace/config.mk | 4 +++- source4/lib/replace/system/iconv.h | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk index ff80955ffe..7103facd51 100644 --- a/source4/lib/replace/config.mk +++ b/source4/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/source4/lib/replace/system/iconv.h b/source4/lib/replace/system/iconv.h index f01d135dd1..abc2d6f4e1 100644 --- a/source4/lib/replace/system/iconv.h +++ b/source4/lib/replace/system/iconv.h @@ -35,11 +35,11 @@ #endif #ifdef HAVE_NATIVE_ICONV -#if defined(HAVE_ICONV_H) +#if defined(HAVE_ICONV) #include -#elif defined(HAVE_GICONV_H) +#elif defined(HAVE_GICONV) #include -#elif defined(HAVE_BICONV_H) +#elif defined(HAVE_BICONV) #include #endif #endif /* HAVE_NATIVE_ICONV */ -- cgit