summaryrefslogtreecommitdiff
path: root/source4/lib/charset
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-24 18:23:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:35 -0500
commite157dccfaf699bc6fe436a8cdf1c95b125cde2db (patch)
tree5d9994241e8093fd10b6532210c04fe513b924c4 /source4/lib/charset
parentca61b4f3b557b5505d9825fad81f6a22860cc716 (diff)
downloadsamba-e157dccfaf699bc6fe436a8cdf1c95b125cde2db.tar.gz
samba-e157dccfaf699bc6fe436a8cdf1c95b125cde2db.tar.bz2
samba-e157dccfaf699bc6fe436a8cdf1c95b125cde2db.zip
r15871: Fix systems with native iconv
(This used to be commit 8ce292bdf3589e5d054bf9a534846c29dfc71124)
Diffstat (limited to 'source4/lib/charset')
-rw-r--r--source4/lib/charset/config.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/charset/config.m4 b/source4/lib/charset/config.m4
index 2e20f7ab37..5d37a781fd 100644
--- a/source4/lib/charset/config.m4
+++ b/source4/lib/charset/config.m4
@@ -49,7 +49,7 @@ AC_ARG_WITH(libiconv,
])
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 @@ for i in $LOOK_DIRS ; do
fi
SMB_CHECK_ICONV_DIR($i, [
- ICONV_FOUND=yes;
+ ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
ICONV_LIBS="$LIBS"
ICONV_LDFLAGS="$LDFLAGS"