Apply the patch to fix iconv detection for FreeBSD to the Samba 3.0.0 branch

as well.
(This used to be commit 44be80e4883c8578b98ec02ac422c97229b063c5)

diff --git a/source3/configure.in b/source3/configure.in
index bd7a31f25d740d6797452bce42634c14e7715f78..19355d41580fef79c272bb1a3fb090476d98cac1 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1605,9 +1605,8 @@ 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
-    if test x"$ICONV_PATH_SPEC" = "xyes" ; then
-       LDFLAGS="-L$i/lib"
-    fi
+dnl Perhaps we should always add a -L
+    LDFLAGS="-L$i/lib"
     LIBS=
     export LDFLAGS LIBS CPPFLAGS
 dnl Try to find iconv(3)
@@ -1616,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")
-        LIBS="$save_LIBS"
         ICONV_LOCATION=$i
         export LDFLAGS LIBS CPPFLAGS
 dnl Now, check for a working iconv ... we want to do it here because