[httpd] Make http modules agnostic to evhttp

configure.ac

@@ -268,6 +268,11 @@ OWNTONE_ARG_WITH_CHECK([OWNTONE_OPTS], [libevent_pthreads support],
 	[libevent_pthreads], [LIBEVENT_PTHREADS], [libevent_pthreads],
 	[evthread_use_pthreads], [event2/thread.h])
 
+dnl Build with libevhtp
+OWNTONE_ARG_WITH_CHECK([OWNTONE_OPTS], [libevhtp support], [libevhtp], [LIBEVHTP],
+	[evhtp])
+AM_CONDITIONAL([COND_LIBEVHTP], [[test "x$with_libevhtp" = "xyes"]])
+
 dnl Build with Avahi (or Bonjour if not)
 OWNTONE_ARG_WITH_CHECK([OWNTONE_OPTS], [Avahi mDNS], [avahi], [AVAHI],
 	[avahi-client >= 0.6.24], [avahi_client_new], [avahi-client/client.h])

src/Makefile.am

@@ -46,6 +46,12 @@ if COND_LIBWEBSOCKETS
 LIBWEBSOCKETS_SRC=websocket.c websocket.h
 endif
 
+if COND_LIBEVHTP
+HTTPDBACKEND_SRC=httpd_libevhtp.c
+else
+HTTPDBACKEND_SRC=httpd_libevhttp.c
+endif
+
 GPERF_FILES = \
 	daap_query.gperf \
 	dacp_prop.gperf \
@@ -92,6 +98,7 @@ owntone_SOURCES = main.c \
 	library.c library.h \
 	$(MDNS_SRC) mdns.h \
 	remote_pairing.c remote_pairing.h \
+	$(HTTPDBACKEND_SRC) \
 	httpd.c httpd.h httpd_internal.h \
 	httpd_rsp.c \
 	httpd_daap.c httpd_daap.h \