From 949a05bcb7dcb4f557f35f5ffea815a1665a6a3e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 6 Nov 2003 17:39:01 +0000
Subject: merge's tpot build fix from 3.0 (This used to be commit
 ac9f9f9ea83b0419d3f1f95b57ff3ead625d7576)

---
 source3/configure.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3/configure.in')

diff --git a/source3/configure.in b/source3/configure.in
index feac7da673..269fdf97ed 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)
@@ -1616,6 +1617,7 @@ dnl Try to find iconv(3)
 	LDFLAGS=$save_LDFLAG
         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
-- 
cgit