merge's tpot build fix from 3.0

(This used to be commit ac9f9f9ea83b0419d3f1f95b57ff3ead625d7576)

diff --git a/source3/configure.in b/source3/configure.in
index feac7da6737af541b2e2bf1575d2972605a44f6a..269fdf97ed331ae1c2201e760c08793c40fcef2b 100644 (file)
--- 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