[MEDIUM] build: switch ebtree users to use new ebtree version
All files referencing the previous ebtree code were changed to point
to the new one in the ebtree directory. A makefile variable (EBTREE_DIR)
is also available to use files from another directory.
The ability to build the libebtree library temporarily remains disabled
because it can have an impact on some existing toolchains and does not
appear worth it in the medium term if we add support for multi-criteria
stickiness for instance.
diff --git a/include/common/standard.h b/include/common/standard.h
index ce70f2e..0a6b68b 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <common/config.h>
-#include <common/eb32tree.h>
+#include <eb32tree.h>
#include <proto/fd.h>
/****** string-specific macros and functions ******/
diff --git a/include/proto/task.h b/include/proto/task.h
index 62f83e3..0cfe28f 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -26,11 +26,11 @@
#include <sys/time.h>
#include <common/config.h>
-#include <common/eb32tree.h>
#include <common/memory.h>
#include <common/mini-clist.h>
#include <common/standard.h>
#include <common/ticks.h>
+#include <eb32tree.h>
#include <types/task.h>
diff --git a/include/types/lb_chash.h b/include/types/lb_chash.h
index 3eee12c..5991ce9 100644
--- a/include/types/lb_chash.h
+++ b/include/types/lb_chash.h
@@ -23,8 +23,8 @@
#define _TYPES_LB_CHASH_H
#include <common/config.h>
-#include <common/ebtree.h>
-#include <common/eb32tree.h>
+#include <ebtree.h>
+#include <eb32tree.h>
struct lb_chash {
struct eb_root act; /* weighted chash entries of active servers */
diff --git a/include/types/lb_fwlc.h b/include/types/lb_fwlc.h
index cad4d13..170eb24 100644
--- a/include/types/lb_fwlc.h
+++ b/include/types/lb_fwlc.h
@@ -23,7 +23,7 @@
#define _TYPES_LB_FWLC_H
#include <common/config.h>
-#include <common/ebtree.h>
+#include <ebtree.h>
struct lb_fwlc {
struct eb_root act; /* weighted least conns on the active servers */
diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h
index 600a511..731f055 100644
--- a/include/types/lb_fwrr.h
+++ b/include/types/lb_fwrr.h
@@ -23,7 +23,7 @@
#define _TYPES_LB_FWRR_H
#include <common/config.h>
-#include <common/ebtree.h>
+#include <ebtree.h>
/* This structure is used to apply fast weighted round robin on a server group */
struct fwrr_group {
diff --git a/include/types/protocols.h b/include/types/protocols.h
index 66c742b..c13c73d 100644
--- a/include/types/protocols.h
+++ b/include/types/protocols.h
@@ -28,8 +28,8 @@
#include <sys/un.h>
#include <common/config.h>
-#include <common/eb32tree.h>
#include <common/mini-clist.h>
+#include <eb32tree.h>
#include <types/counters.h>
#include <types/task.h>
diff --git a/include/types/proxy.h b/include/types/proxy.h
index ec00d74..8348f92 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -29,11 +29,11 @@
#include <common/appsession.h>
#include <common/config.h>
-#include <common/eb32tree.h>
#include <common/mini-clist.h>
#include <common/regex.h>
#include <common/sessionhash.h>
#include <common/tools.h>
+#include <eb32tree.h>
#include <types/acl.h>
#include <types/backend.h>
diff --git a/include/types/server.h b/include/types/server.h
index b3fe83d..935992d 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -26,8 +26,8 @@
#include <arpa/inet.h>
#include <common/config.h>
-#include <common/eb32tree.h>
#include <common/mini-clist.h>
+#include <eb32tree.h>
#include <types/buffers.h>
#include <types/counters.h>
diff --git a/include/types/task.h b/include/types/task.h
index 641cb17..41f889c 100644
--- a/include/types/task.h
+++ b/include/types/task.h
@@ -25,8 +25,8 @@
#include <sys/time.h>
#include <common/config.h>
-#include <common/eb32tree.h>
#include <common/mini-clist.h>
+#include <eb32tree.h>
/* values for task->state */
#define TASK_SLEEPING 0x00 /* task sleeping */