summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Colin Kissa <andrew@topdog.za.net>2021-10-24 12:21:55 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2021-10-24 12:31:20 +0100
commit568506397d1e428945c6041eb9f8ed19ee825229 (patch)
tree341ec77cf50129fd5f7c76155864583cbef3b744 /src
parent8f9402a038a0ad2ce5b4d60ba8891a3ef4f3f1ac (diff)
LMDB: fix build. Bug 2812
Diffstat (limited to 'src')
-rwxr-xr-xsrc/scripts/lookups-Makefile7
-rw-r--r--src/src/EDITME7
-rw-r--r--src/src/macro_predef.c3
3 files changed, 8 insertions, 9 deletions
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