LMDB: fix build. Bug 2812

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 63f3eb86e6d71899badb99577ce6c6ca7afb7681..1082f594eb9a601e47d70522a88cf3523873d442 100755 (executable)
--- 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 44c30ce9b3ad6a1967ba831cd47b708682a146fc..8ef6a19adf1f656982d4af3afac4c9ae841d06a5 100644 (file)
--- 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 89e35878e146684734d4fca188c618cfaf28ea87..6c31ef15659582f0ee4598d28ebfb1d40a300f5b 100644 (file)
--- 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