# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1378720514 -7200
# Node ID 382bff43c6eb6e602925008010c9c02949fe8311
# Parent  fac51f87def01e2841652be51fa1986ca9a7721a
fixed some includes

diff -r fac51f87def0 -r 382bff43c6eb config.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.mk	Mon Sep 09 11:55:14 2013 +0200
@@ -0,0 +1,15 @@
+#
+# config.mk generated by configure
+#
+
+INSTALL_DIR = /export/home/olaf/Projekte/webserver/work
+HOST = x4.fritz.box
+
+
+include $(BUILD_ROOT)/make/gcc.mk
+include $(BUILD_ROOT)/make/linux.mk
+
+CFLAGS += -I/usr/include/libxml2  
+LDFLAGS += -lxml2 -lssl -lcrypto  
+
+
diff -r fac51f87def0 -r 382bff43c6eb make/linux.mk
--- a/make/linux.mk	Sun Sep 08 23:27:07 2013 +0200
+++ b/make/linux.mk	Mon Sep 09 11:55:14 2013 +0200
@@ -28,7 +28,7 @@
 
 
 # compiler and linker flags
-CFLAGS += -DLINUX 
+CFLAGS += -DLINUX
 LDFLAGS += -lpthread -ldl -lnsl -lm -lxerces-c -lldap
 
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/Makefile
--- a/src/server/Makefile	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/Makefile	Mon Sep 09 11:55:14 2013 +0200
@@ -29,15 +29,12 @@
 BUILD_ROOT = ../..
 include $(BUILD_ROOT)/config.mk
 
-# LDFLAGS += -lpthread -ldl -lnsl -lm -lxerces-c -lldap
-
 OBJ_DIR = $(BUILD_ROOT)/build/
 
 MAIN_TARGET = $(BUILD_ROOT)/build/bin/webservd
 
 all: preparation $(MAIN_TARGET) $(PLUGINS)
 
-#include ucx/objs.mk
 include util/objs.mk
 include safs/objs.mk
 include webdav/objs.mk
@@ -57,6 +54,7 @@
 OBJ_DIRS = daemon safs ucx util webdav config admin plugins
 MK_OBJ_DIRS = $(OBJ_DIRS:%=$(OBJ_DIR)server/%)
 
+CFLAGS += -I../
 LDFLAGS += -lucx
 
 preparation: $(MK_OBJ_DIRS)
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/acldata.h
--- a/src/server/daemon/acldata.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/acldata.h	Mon Sep 09 11:55:14 2013 +0200
@@ -29,12 +29,12 @@
 #ifndef ACLCONF_H
 #define	ACLCONF_H
 
+#include <ucx/list.h>
+#include <ucx/map.h>
+
 #include "acl.h"
 #include "../config/acl.h"
 
-#include "../ucx/list.h"
-#include "../ucx/map.h"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/auth.c
--- a/src/server/daemon/auth.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/auth.c	Mon Sep 09 11:55:14 2013 +0200
@@ -31,7 +31,8 @@
 #include <string.h>
 #include <pthread.h>
 
-#include "../ucx/map.h"
+#include <ucx/map.h>
+
 #include "../util/atomic.h"
 #include "auth.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/config.c
--- a/src/server/daemon/config.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/config.c	Mon Sep 09 11:55:14 2013 +0200
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
 
 #include "httplistener.h"
 #include "config.h"
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/error.c
--- a/src/server/daemon/error.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/error.c	Mon Sep 09 11:55:14 2013 +0200
@@ -28,7 +28,7 @@
 
 #include "error.h"
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
 #include "../util/pblock.h"
 #include "../util/strbuf.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/event.c
--- a/src/server/daemon/event.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/event.c	Mon Sep 09 11:55:14 2013 +0200
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../ucx/map.h"
+#include <ucx/map.h>
 
 #include "event.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/event.h
--- a/src/server/daemon/event.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/event.h	Mon Sep 09 11:55:14 2013 +0200
@@ -30,7 +30,7 @@
 #define	EVENT_H
 
 #include "../public/nsapi.h"
-#include "../ucx/string.h"
+#include <ucx/string.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/func.c
--- a/src/server/daemon/func.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/func.c	Mon Sep 09 11:55:14 2013 +0200
@@ -28,10 +28,10 @@
 
 
 #include <stdlib.h>
+#include <ucx/map.h>
 
 #include "../public/nsapi.h"
 #include "../util/pblock.h"
-#include "../ucx/map.h"
 
 #include "func.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/httplistener.c
--- a/src/server/daemon/httplistener.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/httplistener.c	Mon Sep 09 11:55:14 2013 +0200
@@ -46,7 +46,8 @@
 #include <stdbool.h>
 #include <pthread.h>
 
-#include "../ucx/map.h"
+#include <ucx/map.h>
+
 #include "../util/atomic.h"
 #include "httplistener.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/httpparser.h
--- a/src/server/daemon/httpparser.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/httpparser.h	Mon Sep 09 11:55:14 2013 +0200
@@ -30,7 +30,7 @@
 #define	HTTPPARSER_H
 
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
 #include "httprequest.h"
 
 #ifdef	__cplusplus
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/httprequest.h
--- a/src/server/daemon/httprequest.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/httprequest.h	Mon Sep 09 11:55:14 2013 +0200
@@ -29,7 +29,8 @@
 #ifndef HTTPREQUEST_H
 #define	HTTPREQUEST_H
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
+
 #include "sessionhandler.h"
 #include "../public/nsapi.h"
 #include "../util/pool.h"
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/keyfile_auth.h
--- a/src/server/daemon/keyfile_auth.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/keyfile_auth.h	Mon Sep 09 11:55:14 2013 +0200
@@ -30,7 +30,8 @@
 #define	KEYFILE_AUTH_H
 
 #include "../public/auth.h"
-#include "../ucx/map.h"
+
+#include <ucx/map.h>
 #include <inttypes.h>
 
 #ifdef	__cplusplus
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/threadpools.c
--- a/src/server/daemon/threadpools.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/threadpools.c	Mon Sep 09 11:55:14 2013 +0200
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../ucx/map.h"
+#include <ucx/map.h>
 
 #include "threadpools.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/threadpools.h
--- a/src/server/daemon/threadpools.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/threadpools.h	Mon Sep 09 11:55:14 2013 +0200
@@ -29,9 +29,10 @@
 #ifndef THREADPOOLS_H
 #define	THREADPOOLS_H
 
+#include <ucx/string.h>
+
 #include "../public/nsapi.h"
 #include "../util/thrpool.h"
-#include "../ucx/string.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/vfs.c
--- a/src/server/daemon/vfs.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/vfs.c	Mon Sep 09 11:55:14 2013 +0200
@@ -31,8 +31,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <ucx/map.h>
+
 #include "../util/pool.h"
-#include "../ucx/map.h"
 #include "acl.h"
 #include "vfs.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/daemon/vserver.h
--- a/src/server/daemon/vserver.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/daemon/vserver.h	Mon Sep 09 11:55:14 2013 +0200
@@ -29,10 +29,11 @@
 #ifndef VSERVER_H
 #define	VSERVER_H
 
+#include <ucx/string.h>
+
 #include "../util/object.h"
 #include "../public/nsapi.h"
 #include "../daemon/acldata.h"
-#include "../ucx/string.h"
 
 #include "log.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/public/webdav.h
--- a/src/server/public/webdav.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/public/webdav.h	Mon Sep 09 11:55:14 2013 +0200
@@ -127,7 +127,7 @@
 struct XmlElement {
     XmlNs  *xmlns;
     char   *name;
-    void   *content; /* xmlch* or UcxDlist* */
+    void   *content; /* xmlch* or UcxList* */
     size_t ctlen;    /* content string length. If 0, content is a UcxDlist */
 };
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/safs/init.c
--- a/src/server/safs/init.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/safs/init.c	Mon Sep 09 11:55:14 2013 +0200
@@ -27,11 +27,12 @@
  */
 
 #include <dlfcn.h> 
+#include <ucx/string.h>
+
+#include "../daemon/func.h"
+#include "../daemon/log.h"
 
 #include "init.h"
-#include "../ucx/string.h"
-#include "../daemon/func.h"
-#include "../daemon/log.h"
 
 int init_test(pblock *pb, Session *sn, Request *rq) {
     printf("init-test\n");
diff -r fac51f87def0 -r 382bff43c6eb src/server/safs/objecttype.c
--- a/src/server/safs/objecttype.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/safs/objecttype.c	Mon Sep 09 11:55:14 2013 +0200
@@ -26,11 +26,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <ucx/string.h>
+#include <ucx/map.h>
+
 #include "objecttype.h"
 #include "../util/pblock.h"
 
-#include "../ucx/string.h"
-#include "../ucx/map.h"
 #include "../daemon/config.h"
 #include "../daemon/session.h"
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/safs/pathcheck.c
--- a/src/server/safs/pathcheck.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/safs/pathcheck.c	Mon Sep 09 11:55:14 2013 +0200
@@ -26,6 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <ucx/string.h>
+
 #include "pathcheck.h"
 
 #include "../util/pblock.h"
@@ -35,7 +37,6 @@
 #include "../daemon/session.h"
 #include "../daemon/vserver.h"
 
-#include "../ucx/string.h"
 #include "../config/acl.h"
 
 int require_auth(pblock *pb, Session *sn, Request *rq) {
diff -r fac51f87def0 -r 382bff43c6eb src/server/util/date.h
--- a/src/server/util/date.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/util/date.h	Mon Sep 09 11:55:14 2013 +0200
@@ -33,7 +33,7 @@
 
 #include <time.h>
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff -r fac51f87def0 -r 382bff43c6eb src/server/util/object.c
--- a/src/server/util/object.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/util/object.c	Mon Sep 09 11:55:14 2013 +0200
@@ -26,13 +26,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <ucx/string.h>
+
 #include "../public/nsapi.h"
 
 #include "object.h"
 
 #include "pool.h"
 #include "../daemon/func.h"
-#include "../ucx/string.h"
 
 
 
diff -r fac51f87def0 -r 382bff43c6eb src/server/util/strbuf.c
--- a/src/server/util/strbuf.c	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/util/strbuf.c	Mon Sep 09 11:55:14 2013 +0200
@@ -30,8 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <ucx/string.h>
+
 #include "strbuf.h"
-#include "../ucx/string.h"
+
 
 sbuf_t* sbuf_new(size_t size) {
     sbuf_t *buf = malloc(sizeof(sbuf_t));
diff -r fac51f87def0 -r 382bff43c6eb src/server/util/strbuf.h
--- a/src/server/util/strbuf.h	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/util/strbuf.h	Mon Sep 09 11:55:14 2013 +0200
@@ -29,7 +29,7 @@
 #ifndef STRBUF_H
 #define	STRBUF_H
 
-#include "../ucx/string.h"
+#include <ucx/string.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff -r fac51f87def0 -r 382bff43c6eb src/server/webdav/saxhandler.cpp
--- a/src/server/webdav/saxhandler.cpp	Sun Sep 08 23:27:07 2013 +0200
+++ b/src/server/webdav/saxhandler.cpp	Mon Sep 09 11:55:14 2013 +0200
@@ -31,8 +31,9 @@
 #include <string.h>
 #include <iostream>
 
-#include "../ucx/string.h"
-#include "../ucx/list.h"
+#include <ucx/string.h>
+#include <ucx/list.h>
+
 #include "../util/pool.h"
 
 #include "saxhandler.h"