From: Andrew Colin Kissa <andrew@topdog.za.net>
Date: Sun, 24 Oct 2021 11:21:55 +0000 (+0100)
Subject: LMDB: fix build.  Bug 2812
X-Git-Tag: exim-4.96-RC0~142
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/568506397d1e428945c6041eb9f8ed19ee825229

LMDB: fix build.  Bug 2812
---

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 63f3eb86e..1082f594e 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -160,7 +160,7 @@ exec > "$target"
 sed -n "1,/$tag_marker/p" < "$input"
 
 for name_mod in \
-    CDB DBM:dbmdb DNSDB DSEARCH IBASE JSON LSEARCH MYSQL NIS NISPLUS ORACLE \
+    CDB DBM:dbmdb DNSDB DSEARCH IBASE JSON LMDB LSEARCH MYSQL NIS NISPLUS ORACLE \
     PASSWD PGSQL REDIS SQLITE TESTDB WHOSON
 do
   emit_module_rule $name_mod
@@ -177,11 +177,6 @@ fi
 
 OBJ="${OBJ} spf.o"
 
-if want_experimental LMDB
-then
-  OBJ="${OBJ} lmdb.o"
-fi
-
 # readsock is always wanted as it implements the ${readsock } expansion
 OBJ="${OBJ} readsock.o"
 
diff --git a/src/src/EDITME b/src/src/EDITME
index 44c30ce9b..8ef6a19ad 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -495,6 +495,13 @@ SUPPORT_DANE=yes
 # LOOKUP_INCLUDE +=-I /usr/local/include
 # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb
 
+#------------------------------------------------------------------------------
+# If you included LOOKUP_LMDB above you will need the library. Depending
+# on where installed you may also need an include directory
+#
+# LOOKUP_INCLUDE += -I/usr/local/include
+# LOOKUP_LIBS += -llmdb
+
 
 #------------------------------------------------------------------------------
 # Compiling the Exim monitor: If you want to compile the Exim monitor, a
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 89e35878e..6c31ef156 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -233,9 +233,6 @@ due to conflicts with other common macros. */
 #ifdef LOOKUP_LDAP
   builtin_macro_create(US"_HAVE_LOOKUP_LDAP");
 #endif
-#ifdef EXPERIMENTAL_LMDB
-  builtin_macro_create(US"_HAVE_LOOKUP_LMDB");
-#endif
 #ifdef LOOKUP_MYSQL
   builtin_macro_create(US"_HAVE_LOOKUP_MYSQL");
 #endif