JSON: support loadable-module build

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 4aa1d04b115c476867676f66073de37be1c1ba09..d69c1af85880bed00f5fee783ae37b14072b86bd 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -14,6 +14,8 @@ Version 4.98
 
  3. Events smtp:fail:protocol and smtp:fail:syntax
 
 
  3. Events smtp:fail:protocol and smtp:fail:syntax
 

+ 4. JSON lookup support can now be built as a lodable module
+

 Version 4.98
 ------------
  1. The dkim_status ACL condition may now be used in data ACLs
 Version 4.98
 ------------
  1. The dkim_status ACL condition may now be used in data ACLs

diff --git a/src/src/drtables.c b/src/src/drtables.c
index 800d9e4db4e22e840b01c336a9c2c122cac604e5..9dd369a435deec500d09a6038b50d3db5c88a0ec 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -573,7 +573,7 @@ extern lookup_module_info dsearch_lookup_module_info;
 #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
 extern lookup_module_info ibase_lookup_module_info;
 #endif
 #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
 extern lookup_module_info ibase_lookup_module_info;
 #endif

-#if defined(LOOKUP_JSON)
+#if defined(LOOKUP_JSON) && LOOKUP_JSON!=2

 extern lookup_module_info json_lookup_module_info;
 #endif
 #if defined(LOOKUP_LDAP)
 extern lookup_module_info json_lookup_module_info;
 #endif
 #if defined(LOOKUP_LDAP)


@@ -663,7 +663,7 @@ addlookupmodule(NULL, &ibase_lookup_module_info);
 addlookupmodule(NULL, &ldap_lookup_module_info);
 #endif
 
 addlookupmodule(NULL, &ldap_lookup_module_info);
 #endif
 

-#ifdef LOOKUP_JSON
+#if defined(LOOKUP_JSON) && LOOKUP_JSON!=2

 addlookupmodule(NULL, &json_lookup_module_info);
 #endif
 
 addlookupmodule(NULL, &json_lookup_module_info);
 #endif