Cleanup.

* po/POTFILES.in: Remove appinit.c (See e473ab7d).
* src/Makefile.am: Restore incdir, needed for AM_CPPFLAGS. Was
accidentally removed in 01ad06fca.
* src/builtin/sa.bi (sa): Restore initialization of msize. Accidentally
removed in bcd64af9.
* src/main.c: Call mf_server_log_setup after compiling the sources, so
that --lint spits out its diagnostics on stderr (initially placed here
in e75c9a39).

4 files changed, 10 insertions, 2 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ac132733..ca569203 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,3 +34,2 @@ gacopyz/smfi.c
 # libmf.a
-lib/appinit.c
 lib/cache.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7afa8030..e301eb10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,2 +106,4 @@ BUILT_SOURCES=\
 
+incdir=$(pkgdatadir)/$(VERSION)/include
+
 AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\
diff --git a/src/builtin/sa.bi b/src/builtin/sa.bi
index bd2ef1fc..231ad00e 100644
--- a/src/builtin/sa.bi
+++ b/src/builtin/sa.bi
@@ -331,2 +331,8 @@ MF_DEFUN(sa, NUMBER, STRING urlstr, NUMBER prec, OPTIONAL, NUMBER report)
 	
+	rc = mu_stream_size(mstr, &msize);
+	MF_ASSERT(rc == 0,
+		  mfe_failure,
+		  "mu_stream_size: %s",
+		  mu_strerror (rc));
+	
 	ostr = open_connection(env, urlstr, NULL);
diff --git a/src/main.c b/src/main.c
index 3d0264c9..b16a554f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1190,3 +1190,2 @@ main(int argc, char **argv)
 	mf_srvcfg_flush();
-	mf_server_log_setup();
 	
@@ -1256,2 +1255,4 @@ main(int argc, char **argv)
 
+	mf_server_log_setup();
+	
 	switch (mode) {