summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2003-08-14 20:56:04 +0000
committerAlexander Bokovoy <ab@samba.org>2003-08-14 20:56:04 +0000
commit8d670d117c44cc70907cb6747867a555418002ab (patch)
treec0300928585474da3f7b0b9234ea9161f1dcddda
parent9b80349a2f93feac560dc6b3d99dcf2cecb4e635 (diff)
downloadsamba-8d670d117c44cc70907cb6747867a555418002ab.tar.gz
samba-8d670d117c44cc70907cb6747867a555418002ab.tar.bz2
samba-8d670d117c44cc70907cb6747867a555418002ab.zip
Try to honor predefined CPPFLAGS when finding correct iconv flags
(This used to be commit ee362ce47596a90f60b0dd3b414503547863e01b)
-rw-r--r--source3/configure.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in
index d8223a241d..8e147cabff 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1592,6 +1592,9 @@ main(){
samba_cv_HAVE_NATIVE_ICONV=yes,samba_cv_HAVE_NATIVE_ICONV=no,samba_cv_HAVE_NATIVE_ICONV=cross)])
LIBS="$ic_save_LIBS"
if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes"; then
+ CPPFLAGS=$save_CPPFLAGS
+ CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
+ export CPPFLAGS
AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
break
fi