Use embedded evhttp

configure.in

@@ -60,10 +60,10 @@ PKG_CHECK_MODULES(MINIXML, [ mxml ])
 AC_CHECK_HEADER(event.h, , AC_MSG_ERROR([event.h not found]))
 AC_CHECK_LIB([event_core], [event_init], [LIBEVENT_LIBS="-levent_core"], AC_MSG_ERROR([libevent not found]))
 AC_CHECK_HEADER(evhttp.h, , AC_MSG_ERROR([evhttp.h not found]))
-save_LIBS="$LIBS"
-LIBS=-levent_core
-AC_CHECK_LIB([event_extra], [evhttp_new], [LIBEVENT_LIBS="$LIBEVENT_LIBS -levent_extra"], AC_MSG_ERROR([libevent not found]))
-LIBS="$save_LIBS"
+dnl save_LIBS="$LIBS"
+dnl LIBS=-levent_core
+dnl AC_CHECK_LIB([event_extra], [evhttp_new], [LIBEVENT_LIBS="$LIBEVENT_LIBS -levent_extra"], AC_MSG_ERROR([libevent not found]))
+dnl LIBS="$save_LIBS"
 AC_SUBST(LIBEVENT_LIBS)
 
 AC_CHECK_HEADER(avl.h, , AC_MSG_ERROR([avl.h not found]))

src/Makefile.am

@@ -20,6 +20,8 @@ mt_daapd_SOURCES = main.c daapd.h webserver.c \
 	filescanner.c filescanner.h \
 	filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c \
 	mdns_avahi.c mdns_avahi.h \
+	evhttp/http.c evhttp/evhttp.h evhttp/strlcpy.c evhttp/log.c \
+	evhttp/http-internal.h evhttp/log.h evhttp/strlcpy-internal.h \
 	httpd.c httpd.h \
 	httpd_rsp.c httpd_rsp.h \
 	httpd_daap.c httpd_daap.h \

src/httpd.c

@@ -32,7 +32,7 @@
 #include <sys/queue.h>
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 #include "daapd.h"
 #include "err.h"

src/httpd.h

@@ -3,7 +3,7 @@
 #define __HTTPD_H__
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 
 void

src/httpd_daap.c

@@ -35,7 +35,7 @@
 #include <stdint.h>
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 #include <avl.h>
 
 #include "daapd.h"

src/httpd_daap.h

@@ -3,7 +3,7 @@
 #define __HTTPD_DAAP_H__
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 int
 daap_init(void);

src/httpd_rsp.c

@@ -33,7 +33,7 @@
 #include <limits.h>
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 #include <mxml.h>
 

src/httpd_rsp.h

@@ -3,7 +3,7 @@
 #define __HTTPD_RSP_H__
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 int
 rsp_init(void);

src/transcode.c

@@ -34,7 +34,7 @@
 #include <stdint.h>
 
 #include <event.h>
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>

src/transcode.h

@@ -2,7 +2,7 @@
 #ifndef __TRANSCODE_H__
 #define __TRANSCODE_H__
 
-#include <evhttp.h>
+#include "evhttp/evhttp.h"
 
 struct transcode_ctx;