nhttpd: fix compile after include change.

Origin commit data
------------------
Branch: ni/coolstream
Commit: cfea9b493f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/nhttpd/Makefile.am

@@ -3,6 +3,8 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \

src/nhttpd/tuxboxapi/coolstream/Makefile.am

@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \

src/nhttpd/yhttpd.cpp

@@ -14,12 +14,12 @@
 
 // yhttpd
 #include "yconfig.h"
-#include "ylogging.h"
+#include <ylogging.h>
-#include "ylanguage.h"
+#include <ylanguage.h>
-#include "yhook.h"
+#include <yhook.h>
 
 #ifdef Y_CONFIG_USE_YPARSER
-#include "mod_yparser.h"
+#include <mod_yparser.h>
 static CyParser yParser;
 #endif
 

src/nhttpd/yhttpd.h

@@ -15,8 +15,8 @@
 #include <stdlib.h>
 // yhttpd
 #include "yconfig.h"
-#include "ytypes_globals.h"
+//#include <ytypes_globals.h>
-#include "ywebserver.h"
+#include <ywebserver.h>
 
 //-----------------------------------------------------------------------------
 class Cyhttpd {

src/nhttpd/yhttpd_core/Makefile.am

@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \

src/nhttpd/yhttpd_core/ylanguage.cpp

@@ -9,8 +9,8 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
-#include "yhttpd.h"
+#include <yhttpd.h>
 #include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"

src/nhttpd/yhttpd_core/ylogging.cpp

@@ -9,7 +9,7 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ylogging.h"
 #include "yconnection.h"

src/nhttpd/yhttpd_core/ylogging.h

@@ -8,7 +8,7 @@
 // system
 #include <pthread.h>
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 
 // forward declaration
 class CWebserverConnection;

src/nhttpd/yhttpd_core/yrequest.h

@@ -11,7 +11,7 @@
 #include <map>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 // forward declaration

src/nhttpd/yhttpd_core/ysocket.h

@@ -13,7 +13,7 @@
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 #ifdef Y_CONFIG_USE_OPEN_SSL

src/nhttpd/yhttpd_core/ywebserver.h

@@ -20,7 +20,7 @@
 #include <arpa/inet.h>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ysocket.h"