s3-build: only include intl protos where needed.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c359728064ba335635769d11adea5c88e5237f61..94f8ad60b46950d131f0ef2d217736a3d4946d34 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -265,13 +265,6 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
 void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
                           int n_groups, gid_t *groups);
 
-/* The following definitions come from intl/lang_tdb.c  */
-
-bool lang_tdb_init(const char *lang);
-const char *lang_msg(const char *msgid);
-void lang_msg_free(const char *msgstr);
-char *lang_tdb_current(void);
-
 /* The following definitions come from lib/access.c  */
 
 bool client_match(const char *tok, const void *item);

diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 19a50c49f66e570261c11771b3768b5c69b28461..8fcb9f2bfc895e9dd2b7e1e9206fccd03cf1aedf 100644 (file)
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "intl/lang_tdb.h"
 
 static TDB_CONTEXT *tdb;
 

diff --git a/source3/intl/lang_tdb.h b/source3/intl/lang_tdb.h
new file mode 100644 (file)
index 0000000..da24684
--- /dev/null
+++ b/source3/intl/lang_tdb.h
@@ -0,0 +1,7 @@
+
+/* The following definitions come from intl/lang_tdb.c  */
+
+bool lang_tdb_init(const char *lang);
+const char *lang_msg(const char *msgid);
+void lang_msg_free(const char *msgstr);
+char *lang_tdb_current(void);

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index 73bacdccbb7ea8aaac16619bac351a116c503d37..97129f8b4a0a4cfc9abb7ffc95432dbc3aa47e7f 100644 (file)
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -29,6 +29,7 @@
 */
 
 #include "includes.h"
+#include "intl/lang_tdb.h"
 
  int d_vfprintf(FILE *f, const char *format, va_list ap)
 {

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index c7edf6b27ddb0da0a511c41d2b7a8059a2826c20..c50f92bca7791741b99631e99da346e22aad8c78 100644 (file)
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -21,6 +21,7 @@
 #include "system/passwd.h"
 #include "system/filesys.h"
 #include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
 
 #define MAX_VARIABLES 10000
 

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index f897d1097432a9262cd1badd42e0043e369e3746..59475d12b57ccb4299ea44a042a0156f67b51f92 100644 (file)
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
 
 /*
   during a file download we first check to see if there is a language

diff --git a/source3/web/swat.c b/source3/web/swat.c
index b6e5e2ef17a3fb5f1e66fecc18b0d965b4639ce9..f06bf5ed26c9c03c72823ef385e0967b0b79eb2a 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -34,6 +34,7 @@
 #include "printing/pcap.h"
 #include "printing/load.h"
 #include "passdb.h"
+#include "intl/lang_tdb.h"
 
 static int demo_mode = False;
 static int passwd_only = False;