diff options
| author | Richard Sharpe <sharpe@samba.org> | 2003-07-02 21:15:59 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2003-07-02 21:15:59 +0000 |
| commit | 936d8e4a3508c5d7ec77cd325331161236b53cbc (patch) | |
| tree | 4d7bca25ce0746bf0ea73aa6247a67bdbda66a38 | |
| parent | af4d65889420eb3bb71be67d619dbc0c62e21101 (diff) | |
| download | samba-936d8e4a3508c5d7ec77cd325331161236b53cbc.tar.gz samba-936d8e4a3508c5d7ec77cd325331161236b53cbc.tar.bz2 samba-936d8e4a3508c5d7ec77cd325331161236b53cbc.zip | |
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)
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index 094e8c85e7..4d07224194 100644 --- 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 a767014232..e2fe2ac819 100644 --- 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); |