summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-11-06 16:58:33 +0000
committerTim Potter <tpot@samba.org>2003-11-06 16:58:33 +0000
commit0b76382c5d9d357425aacc40f77c54dbe72c7527 (patch)
treefb1e4c1c8c115f2b2f4e826f4cc1496b1aa538d1 /source3
parent2c1d659020b04f5ade111c6d06a7ce47955d40e0 (diff)
downloadsamba-0b76382c5d9d357425aacc40f77c54dbe72c7527.tar.gz
samba-0b76382c5d9d357425aacc40f77c54dbe72c7527.tar.bz2
samba-0b76382c5d9d357425aacc40f77c54dbe72c7527.zip
Undo last commit to get things building again.
(This used to be commit d3af6b443d9f52b007a1c022908d767edf238b9e)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 19355d4158..bd7a31f25d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1605,8 +1605,9 @@ for i in $LOOK_DIRS ; do
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$i/include"
dnl This is here to handle -withval stuff for --with-libiconv
-dnl Perhaps we should always add a -L
- LDFLAGS="-L$i/lib"
+ if test x"$ICONV_PATH_SPEC" = "xyes" ; then
+ LDFLAGS="-L$i/lib"
+ fi
LIBS=
export LDFLAGS LIBS CPPFLAGS
dnl Try to find iconv(3)
@@ -1615,6 +1616,7 @@ dnl Try to find iconv(3)
if test "$ICONV_FOUND" = yes; then
LIB_ADD_DIR(LDFLAGS, "$i/lib")
CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
+ LIBS="$save_LIBS"
ICONV_LOCATION=$i
export LDFLAGS LIBS CPPFLAGS
dnl Now, check for a working iconv ... we want to do it here because