summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2003-11-06 05:37:30 +0000
committerRichard Sharpe <sharpe@samba.org>2003-11-06 05:37:30 +0000
commit9144e46889b68fd4136799f10f2b3e5610346976 (patch)
tree65e2a7692eb527511185460dcfc0eb263f8e1039
parent3d50c8aa2226aea58695b9295556f805d1cf165d (diff)
downloadsamba-9144e46889b68fd4136799f10f2b3e5610346976.tar.gz
samba-9144e46889b68fd4136799f10f2b3e5610346976.tar.bz2
samba-9144e46889b68fd4136799f10f2b3e5610346976.zip
Make the recent changes more pretty.
(This used to be commit e490efd29a8a6b1fc7087b7dd51bbd41465803c3)
-rw-r--r--source3/configure.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 8ac4541024..beb9b1d066 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1606,9 +1606,7 @@ for i in $LOOK_DIRS ; do
CPPFLAGS="$CPPFLAGS -I$i/include"
dnl This is here to handle -withval stuff for --with-libiconv
dnl Perhaps we should always add a -L
-dnl if test x"$ICONV_PATH_SPEC" = "xyes" ; then
- LDFLAGS="-L$i/lib"
-dnl fi
+ LDFLAGS="-L$i/lib"
LIBS=
export LDFLAGS LIBS CPPFLAGS
dnl Try to find iconv(3)
@@ -1617,7 +1615,6 @@ dnl Try to find iconv(3)
if test "$ICONV_FOUND" = yes; then
LIB_ADD_DIR(LDFLAGS, "$i/lib")
CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
-dnl LIBS="$save_LIBS"
ICONV_LOCATION=$i
export LDFLAGS LIBS CPPFLAGS
dnl Now, check for a working iconv ... we want to do it here because