Move base into lib

This involves reverting dd267e8fc3,
    but that gets lost in the move.

    This builds on Ubuntu and Windows at this time.

Makefile.am

@@ -6,7 +6,7 @@ if KCM
 kcm_dir = kcm
 endif
 
-SUBDIRS=  include lib/roken base lib kuser kdc admin kadmin kpasswd 
+SUBDIRS=  include lib kuser kdc admin kadmin kpasswd 
 SUBDIRS+= $(kcm_dir) appl tools tests packages etc po
 
 if HEIMDAL_DOCUMENTATION

NTMakefile

@@ -33,7 +33,7 @@
 thirdparty=thirdparty
 !endif
 
-SUBDIRS = include lib\roken base lib kuser kdc admin kadmin kpasswd appl doc \
+SUBDIRS = include lib kuser kdc admin kadmin kpasswd appl doc \
 	tools tests packages etc $(thirdparty) packages\windows\installer
 
 !include windows/NTMakefile.w32

cf/Makefile.am.common

@@ -244,7 +244,7 @@ LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
 LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
 endif
 
-LIB_heimbase = $(top_builddir)/base/libheimbase.la
+LIB_heimbase = $(top_builddir)/lib/base/libheimbase.la
 
 if DCE
 LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la

configure.ac

@@ -609,7 +609,7 @@ AC_CONFIG_FILES(Makefile 		\
 	include/hcrypto/Makefile	\
 	include/kadm5/Makefile		\
 	lib/Makefile			\
-	base/Makefile			\
+	lib/base/Makefile			\
 	lib/asn1/Makefile		\
 	lib/com_err/Makefile		\
 	lib/hcrypto/Makefile		\

lib/Makefile.am

@@ -23,6 +23,7 @@ endif
 
 SUBDIRS = \
 	roken \
+	base \
 	vers \
 	$(dir_editline) \
 	$(dir_com_err) \
@@ -42,4 +43,4 @@ SUBDIRS = \
 	$(dir_otp) \
 	$(dir_dce)
 
-EXTRA_DIST = NTMakefile heimdal
+EXTRA_DIST = NTMakefile heimdal

lib/NTMakefile

@@ -40,7 +40,7 @@ dir_dce = kdfs
 dir_hcrypto = hcrypto
 !endif
 
-SUBDIRS = vers com_err sl wind asn1 sqlite \
+SUBDIRS = roken base vers com_err sl wind asn1 sqlite \
 	$(dir_hcrypto) hx509 krb5 heimdal ntlm kafs gssapi hdb \
 	kadm5 $(dir_45) $(dir_otp) $(dir_dce) ..\packages\windows\assembly
 

lib/base/Makefile.am

@@ -52,4 +52,4 @@ EXTRA_DIST = NTMakefile version-script.map
 
 base64.c:
 	$(RM) base64.c
-	$(LN_S) $(srcdir)/../lib/roken/base64.c .
+	$(LN_S) $(srcdir)/../roken/base64.c .

lib/base/NTMakefile

@@ -29,11 +29,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-RELDIR=base
+RELDIR=lib\base
 
 intcflags=-I$(SRCDIR) -I$(OBJ)
 
-!include ../windows/NTMakefile.w32
+!include ../../windows/NTMakefile.w32
 
 INCFILES=$(INCDIR)\heimbase.h
 

lib/base/baselocl.h

@@ -60,6 +60,8 @@
 #define bindtextdomain(package, localedir)
 #endif
 
+#include <roken.h>
+
 #include "heimqueue.h"
 #include "heim_threads.h"
 #include "heimbase.h"

lib/base/db.c

@@ -53,11 +53,10 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef WIN32
-#include <sys/file.h>
-#endif
-#ifdef HAVE_IO_H
+#ifdef WIN32
 #include <io.h>
+#else
+#include <sys/file.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

lib/hx509/Makefile.am

@@ -96,7 +96,7 @@ libhx509_la_LIBADD = \
 	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/wind/libwind.la \
-	$(top_builddir)/base/libheimbase.la \
+	$(top_builddir)/lib/base/libheimbase.la \
 	$(LIBADD_roken) \
 	$(LIB_dlopen)
 

lib/krb5/Makefile.am

@@ -67,7 +67,7 @@ libkrb5_la_LIBADD = \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(top_builddir)/lib/ipc/libheim-ipcc.la \
 	$(top_builddir)/lib/wind/libwind.la \
-	$(top_builddir)/base/libheimbase.la \
+	$(top_builddir)/lib/base/libheimbase.la \
 	$(LIB_pkinit) \
 	$(use_sqlite) \
 	$(LIB_com_err) \

lib/roken/NTMakefile

@@ -163,12 +163,11 @@ INCFILES = 			\
 	$(INCDIR)\stdbool.h	\
 	$(INCDIR)\syslog.h	\
 	$(INCDIR)\vis.h		\
+!ifndef HAVE_STDINT_H
+	$(INCDIR)\stdint.h	\
+!endif
 	$(INCDIR)\xdbm.h
 
-#!ifndef HAVE_STDINT_H
-#INCFILES += $(INCDIR)\stdint.h
-#!endif
-
 clean::
 	-$(RM) $(XHEADERS)
 

lib/roken/roken.h.in

@@ -104,7 +104,9 @@ typedef int rk_socket_t;
 #endif
 
 #ifdef _MSC_VER
+#ifndef HAVE_STDINT_H
 #include <intsafe.h>
+#endif
 
 /* Declarations for Microsoft Visual C runtime on Windows */