diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-10-21 10:12:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:32 -0500 |
| commit | 2e468ee5df6371799d627f78245417fd61c5741d (patch) | |
| tree | 1a67f35e02dea04fca4cacd96d06472c657326f9 | |
| parent | 515c92a759ad30059f65d3e65dc9f642dc03852a (diff) | |
| download | samba-2e468ee5df6371799d627f78245417fd61c5741d.tar.gz samba-2e468ee5df6371799d627f78245417fd61c5741d.tar.bz2 samba-2e468ee5df6371799d627f78245417fd61c5741d.zip | |
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)
| -rw-r--r-- | source4/lib/replace/config.mk | 4 | ||||
| -rw-r--r-- | 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 <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 */ |