From fcc62bb73ab78beeb85a6162132b1b4e641601da Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Thu, 5 May 2011 18:30:02 +0200
Subject: [PATCH] fix build of the "utils" test drivers

---
 src/utils/Makefile       | 59 ++++++++++++++++++++--------------------
 src/utils/base64.cpp     |  1 +
 src/utils/circache.cpp   |  1 +
 src/utils/copyfile.cpp   |  1 +
 src/utils/fstreewalk.cpp |  3 ++
 src/utils/idfile.cpp     |  3 ++
 src/utils/md5.cpp        |  1 +
 src/utils/mimeparse.cpp  |  3 ++
 src/utils/netcon.cpp     |  1 +
 src/utils/readfile.cpp   |  2 ++
 src/utils/transcode.cpp  |  6 ++--
 src/utils/utf8iter.cpp   |  2 ++
 src/utils/wipedir.cpp    |  2 ++
 13 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/src/utils/Makefile b/src/utils/Makefile
index 8cbc316f..9132777f 100644
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1,11 +1,9 @@
 depth = ..
 include $(depth)/mk/sysconf
 
-PROGS = trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi trconftree \
-        wipedir smallut \
-        trfstreewalk trpathut \
-        transcode trbase64 \
-        trmimeparse trexecmd utf8iter idfile
+PROGS = trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi \
+      trconftree wipedir smallut  trfstreewalk trpathut transcode trbase64 \
+      trmimeparse trexecmd utf8iter idfile
 
 all: $(PROGS) $(BIGLIB)
 
@@ -15,38 +13,38 @@ force:
 
 FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o $(BIGLIB)
 trfstreewalk : $(FSTREEWALK_OBJS)
-	$(CXX) -o trfstreewalk $(FSTREEWALK_OBJS) $(LIBICONV)
+	$(CXX) -o trfstreewalk $(FSTREEWALK_OBJS) $(LIBICONV) \
+	       $(LIBSYS)
 trfstreewalk.o : fstreewalk.cpp fstreewalk.h
 	$(CXX) -o trfstreewalk.o -c $(ALL_CXXFLAGS) \
 	       -DTEST_FSTREEWALK fstreewalk.cpp
 
-READFILE_OBJS= trreadfile.o readfile.o $(BIGLIB)
+READFILE_OBJS= trreadfile.o $(BIGLIB)
 trreadfile : $(READFILE_OBJS)
 	$(CXX) -o trreadfile $(READFILE_OBJS) $(LIBICONV) $(LIBSYS)
 trreadfile.o : readfile.cpp readfile.h
 	$(CXX) -o trreadfile.o -c $(ALL_CXXFLAGS) \
 	       -DTEST_READFILE readfile.cpp
 
-CIRCACHE_OBJS= trcircache.o circache.o $(BIGLIB)
+CIRCACHE_OBJS= trcircache.o $(BIGLIB)
 trcircache : $(CIRCACHE_OBJS)
-	$(CXX) -o trcircache $(CIRCACHE_OBJS) $(LIBICONV) $(LIBSYS)
+	$(CXX) -o trcircache $(CIRCACHE_OBJS) $(LIBICONV) $(LIBSYS) -lz
 trcircache.o : circache.cpp circache.h
 	$(CXX) -o trcircache.o -c $(ALL_CXXFLAGS) \
 	       -DTEST_CIRCACHE circache.cpp
 
-COPYFILE_OBJS= trcopyfile.o copyfile.o $(BIGLIB)
+COPYFILE_OBJS= trcopyfile.o $(BIGLIB)
 trcopyfile : $(COPYFILE_OBJS)
 	$(CXX) -o trcopyfile $(COPYFILE_OBJS) $(LIBICONV) $(LIBSYS)
 trcopyfile.o : copyfile.cpp copyfile.h
 	$(CXX) -o trcopyfile.o -c $(ALL_CXXFLAGS) \
 	       -DTEST_COPYFILE copyfile.cpp
 
-MD5_OBJS= trmd5.o md5.o $(BIGLIB)
+MD5_OBJS= trmd5.o $(BIGLIB)
 trmd5 : $(MD5_OBJS)
 	$(CXX) -o trmd5 $(MD5_OBJS) $(LIBICONV) $(LIBSYS)
 trmd5.o : md5.cpp md5.h
-	$(CXX) -o trmd5.o -c $(ALL_CXXFLAGS) \
-	       -DTEST_MD5 md5.cpp
+	$(CXX) -o trmd5.o -c $(ALL_CXXFLAGS) -DTEST_MD5 md5.cpp
 
 PATHUT_OBJS= trpathut.o  $(BIGLIB)
 trpathut : $(PATHUT_OBJS) 
@@ -74,21 +72,24 @@ trexecmd.o : execmd.cpp execmd.h
 
 TRANSCODE_OBJS= trtranscode.o  $(BIGLIB) 
 transcode : $(TRANSCODE_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o transcode $(TRANSCODE_OBJS) $(LIBICONV)
+	$(CXX) $(ALL_CXXFLAGS) -o transcode $(TRANSCODE_OBJS) \
+	       $(LIBICONV) $(LIBSYS)
 trtranscode.o : transcode.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_TRANSCODE -c -o trtranscode.o \
 	       transcode.cpp
 
 IDFILE_OBJS= tridfile.o  $(BIGLIB) 
 idfile : $(IDFILE_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o idfile $(IDFILE_OBJS) $(LIBICONV)
+	$(CXX) $(ALL_CXXFLAGS) -o idfile $(IDFILE_OBJS) \
+	       $(LIBICONV) $(LIBSYS)
 tridfile.o : idfile.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_IDFILE -c -o tridfile.o \
 	       idfile.cpp
 
 MIMEPARSE_OBJS= trmimeparse.o  $(BIGLIB) 
 trmimeparse : $(MIMEPARSE_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o trmimeparse $(MIMEPARSE_OBJS) $(LIBICONV)
+	$(CXX) $(ALL_CXXFLAGS) -o trmimeparse $(MIMEPARSE_OBJS) \
+	       $(LIBICONV) $(LIBSYS)
 trmimeparse.o : mimeparse.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_MIMEPARSE -c -o trmimeparse.o \
 	       mimeparse.cpp
@@ -102,42 +103,40 @@ trsmallut.o : smallut.cpp smallut.h
 ../lib/smallut.o: smallut.cpp smallut.h
 	cd ../lib;make smallut.o
 
-WIPEDIR_OBJS= trwipedir.o  $(BIGLIB) 
+WIPEDIR_OBJS= trwipedir.o $(BIGLIB) 
 wipedir : $(WIPEDIR_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o wipedir $(WIPEDIR_OBJS) -L/opt/local/lib -liconv
+	$(CXX) $(ALL_CXXFLAGS) -o wipedir $(WIPEDIR_OBJS) $(LIBICONV) $(LIBSYS)
 trwipedir.o : wipedir.cpp 
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_WIPEDIR -c -o trwipedir.o \
-	       wipedir.cpp
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_WIPEDIR -c -o trwipedir.o wipedir.cpp
 
 UTF8ITER_OBJS= trutf8iter.o 
 utf8iter : $(UTF8ITER_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o utf8iter $(UTF8ITER_OBJS) $(BIGLIB) $(LIBICONV) 
+	$(CXX) $(ALL_CXXFLAGS) -o utf8iter $(UTF8ITER_OBJS) $(BIGLIB) \
+	       $(LIBICONV) $(LIBSYS)
 trutf8iter.o : utf8iter.cpp utf8iter.h
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_UTF8ITER -c -o trutf8iter.o \
-	       utf8iter.cpp
-
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_UTF8ITER -c -o trutf8iter.o utf8iter.cpp
 
 CONFTREE_OBJS= trconftree.o  $(BIGLIB)
 trconftree : $(CONFTREE_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o trconftree $(CONFTREE_OBJS) $(LIBICONV) 
+	$(CXX) $(ALL_CXXFLAGS) -o trconftree $(CONFTREE_OBJS) \
+	       $(LIBICONV) $(LIBSYS)
 trconftree.o : conftree.cpp 
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \
-	       conftree.cpp
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o conftree.cpp
 
 BASE64_OBJS= trbase64.o  $(BIGLIB)
 trbase64 : $(BASE64_OBJS) 
 	$(CXX) $(ALL_CXXFLAGS) -o trbase64 $(BASE64_OBJS)
 trbase64.o : base64.cpp 
-	$(CXX) $(ALL_CXXFLAGS) -DTEST_BASE64 -c -o trbase64.o \
-	       base64.cpp
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_BASE64 -c -o trbase64.o base64.cpp
 
 X11MON_OBJS= trx11mon.o x11mon.o
 trx11mon : $(X11MON_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o trx11mon $(X11MON_OBJS)  -L/usr/X11R6/lib -lX11
+	$(CXX) $(ALL_CXXFLAGS) -o trx11mon $(X11MON_OBJS) -L/usr/X11R6/lib -lX11
 trx11mon.o : x11mon.cpp x11mon.h
 	$(CXX) -o trx11mon.o -c $(ALL_CXXFLAGS) -DTEST_X11MON x11mon.cpp
 x11mon.o: x11mon.cpp
 	$(CXX) -c -I/usr/X11R6/include $(ALL_CXXFLAGS) x11mon.cpp
+
 clean:
 	rm -f *.o $(PROGS)
 
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index ea84d0db..ac29569e 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -218,6 +218,7 @@ void base64_encode(const string &in, string &out)
 
 #ifdef TEST_BASE64
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "readfile.h"
 
diff --git a/src/utils/circache.cpp b/src/utils/circache.cpp
index 70cd6c9a..6b9d8815 100644
--- a/src/utils/circache.cpp
+++ b/src/utils/circache.cpp
@@ -1189,6 +1189,7 @@ static bool inflateToDynBuf(void* inp, UINT inlen, void **outpp, UINT *outlenp)
 }
 
 #else // TEST ->
+#include "autoconfig.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/utils/copyfile.cpp b/src/utils/copyfile.cpp
index 389ee0be..50bf6821 100644
--- a/src/utils/copyfile.cpp
+++ b/src/utils/copyfile.cpp
@@ -133,6 +133,7 @@ bool renameormove(const char *src, const char *dst, string &reason)
 
 #else 
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/src/utils/fstreewalk.cpp b/src/utils/fstreewalk.cpp
index 1b071e08..b47fa5e0 100644
--- a/src/utils/fstreewalk.cpp
+++ b/src/utils/fstreewalk.cpp
@@ -405,6 +405,9 @@ FsTreeWalker::Status FsTreeWalker::iwalk(const string &top,
 }
 	
 #else // TEST_FSTREEWALK
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 
 #include <iostream>
diff --git a/src/utils/idfile.cpp b/src/utils/idfile.cpp
index 20394978..0859b6e9 100644
--- a/src/utils/idfile.cpp
+++ b/src/utils/idfile.cpp
@@ -172,6 +172,9 @@ string idFileMem(const string& data)
 
 #else
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <string>
 #include <iostream>
 
diff --git a/src/utils/md5.cpp b/src/utils/md5.cpp
index 56b40afa..14501501 100644
--- a/src/utils/md5.cpp
+++ b/src/utils/md5.cpp
@@ -393,6 +393,7 @@ bool MD5File(const string& filename, string &digest, string *reason)
 #else
 
 // Test driver
+#include <stdio.h>
 #include <stdlib.h>
 
 #include <string>
diff --git a/src/utils/mimeparse.cpp b/src/utils/mimeparse.cpp
index 852e82ba..c51b0e1b 100644
--- a/src/utils/mimeparse.cpp
+++ b/src/utils/mimeparse.cpp
@@ -778,6 +778,9 @@ time_t rfc2822DateToUxTime(const string& dt)
 
 #else 
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #include <string>
diff --git a/src/utils/netcon.cpp b/src/utils/netcon.cpp
index 5e3ecfe9..995b9ce2 100644
--- a/src/utils/netcon.cpp
+++ b/src/utils/netcon.cpp
@@ -888,6 +888,7 @@ NetconServLis::checkperms(void *cl, int)
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
+#include <string.h>
 
 #include "debuglog.h"
 #include "netcon.h"
diff --git a/src/utils/readfile.cpp b/src/utils/readfile.cpp
index 9a142f2f..444f44b3 100644
--- a/src/utils/readfile.cpp
+++ b/src/utils/readfile.cpp
@@ -191,7 +191,9 @@ bool file_scan(const string &fn, FileScanDo* doer, off_t startoffs,
 }
 
 #else // Test
+#include "autoconfig.h"
 
+#include <stdio.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/utils/transcode.cpp b/src/utils/transcode.cpp
index 60b6dac3..4beeb3d4 100644
--- a/src/utils/transcode.cpp
+++ b/src/utils/transcode.cpp
@@ -132,13 +132,15 @@ bool transcode(const string &in, string &out, const string &icode,
 
 #else
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include <string>
 #include <iostream>
 
-#include <unistd.h>
-#include <fcntl.h>
 
 using namespace std;
 
diff --git a/src/utils/utf8iter.cpp b/src/utils/utf8iter.cpp
index ac51dbf4..e01ed7c0 100644
--- a/src/utils/utf8iter.cpp
+++ b/src/utils/utf8iter.cpp
@@ -15,6 +15,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <stdio.h>
+#include <stdlib.h>
+
 #include <string>
 #include <iostream>
 #include <list>
diff --git a/src/utils/wipedir.cpp b/src/utils/wipedir.cpp
index f11973a6..d5b2e882 100644
--- a/src/utils/wipedir.cpp
+++ b/src/utils/wipedir.cpp
@@ -112,6 +112,8 @@ int wipedir(const string& dir, bool selfalso, bool recurse)
 
 #else // FILEUT_TEST
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 
 #include "wipedir.h"