[build] modify build, includes for xxHash v0.8.0

src/CMakeLists.txt

@@ -765,7 +765,7 @@ add_executable(lighttpd
 	reqpool.c
 	inet_ntop_cache.c
 	ls-hpack/lshpack.c
-	ls-hpack/deps/xxhash/xxhash.c
+	algo_xxhash.c
 	network.c
 	network_write.c
 	data_config.c

src/Makefile.am

@@ -101,7 +101,7 @@ src = server.c response.c connections.c h2.c reqpool.c \
 	network.c \
 	network_write.c \
 	ls-hpack/lshpack.c \
-	ls-hpack/deps/xxhash/xxhash.c \
+	algo_xxhash.c \
 	data_config.c \
 	vector.c \
 	configfile.c configparser.c
@@ -453,7 +453,7 @@ mod_wstunnel_la_LIBADD = $(common_libadd) $(CRYPTO_LIB)
 hdr = base64.h buffer.h burl.h network.h log.h http_kv.h keyvalue.h \
 	response.h request.h reqpool.h fastcgi.h chunk.h h2.h \
 	first.h http_chunk.h \
-	algo_md.h algo_md5.h algo_sha1.h algo_splaytree.h \
+	algo_md.h algo_md5.h algo_sha1.h algo_splaytree.h algo_xxhash.h \
 	http_auth.h http_header.h http_vhostdb.h stream.h \
 	fdevent.h gw_backend.h connections.h base.h base_decls.h stat_cache.h \
 	plugin.h plugin_config.h \
@@ -469,7 +469,6 @@ hdr = base64.h buffer.h burl.h network.h log.h http_kv.h keyvalue.h \
 	mod_magnet_cache.h \
 	ls-hpack/lshpack.h \
 	ls-hpack/lsxpack_header.h \
-	ls-hpack/deps/xxhash/xxhash.h \
 	ls-hpack/huff-tables.h
 
 

src/SConscript

@@ -80,7 +80,7 @@ common_src = Split("base64.c buffer.c burl.c log.c \
 src = Split("server.c response.c connections.c h2.c reqpool.c \
 	inet_ntop_cache.c \
 	ls-hpack/lshpack.c \
-	ls-hpack/deps/xxhash/xxhash.c \
+	algo_xxhash.c \
 	network.c \
 	network_write.c \
 	data_config.c \

src/algo_xxhash.c

@@ -40,4 +40,4 @@
 #define XXH_STATIC_LINKING_ONLY   /* access advanced declarations */
 #define XXH_IMPLEMENTATION   /* access definitions */
 
-#include "xxhash.h"
+#include "algo_xxhash.h"

src/ls-hpack/lshpack.c

@@ -24,7 +24,7 @@ SOFTWARE.
 
 /*(lighttpd customization)*/
 #ifndef XXH_HEADER_NAME
-#define XXH_HEADER_NAME "ls-hpack/deps/xxhash/xxhash.h"
+#define XXH_HEADER_NAME "algo_xxhash.h"
 #endif
 #ifndef LS_HPACK_USE_LARGE_TABLES
 #define LS_HPACK_USE_LARGE_TABLES 0

src/meson.build

@@ -687,7 +687,7 @@ main_src = [
 	'h2.c',
 	'inet_ntop_cache.c',
 	'ls-hpack/lshpack.c',
-	'ls-hpack/deps/xxhash/xxhash.c',
+	'algo_xxhash.c',
 	'network_write.c',
 	'network.c',
 	'reqpool.c',