Fixing problems in the iconv discovery stuff in configure.in.

This is the first part of the fix that at least allows configure to
walk the list of supplied locations where libiconv etc might be found.

aclocal.m4 also needs a fix, as does a later test.
(This used to be commit 20786543139c546d112f8f6b6d4d796ee7fed609)

diff --git a/source3/configure.in b/source3/configure.in
index 094e8c85e7483c12472ab42770ac3f55b6488302..4d07224194384159e6af21c55b0e3d075dfded15 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1519,7 +1519,7 @@ dnl Try to find iconv(3)
     jm_ICONV($i)
 
     CPPFLAGS=$save_CPPFLAGS
-    if test -n "$ICONV_FOUND" ; then
+    if test "$ICONV_FOUND" = yes; then
         LDFLAGS=$save_LDFLAGS
         LIB_ADD_DIR(LDFLAGS, "$i/lib")
         CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index a767014232be14b2277c5b539445d50e763da3b5..e2fe2ac819c0ca42736a701c76fd934e9f37a675 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -867,6 +867,7 @@ void build_options(BOOL screen);
                exit(1);
        }
 
+
        if (!init_account_policy()) {
                DEBUG(0,("Could not open account policy tdb.\n"));
                exit(1);