X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f1e05cc79778c693a1a2bad478ced44791922cce..5b7a7c051c9ab9ee7c924a611f90ef2be03e0ad0:/src/scripts/lookups-Makefile?ds=sidebyside

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 14c15259e..51fbd944b 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -28,8 +28,8 @@ then
 fi
 
 input=lookups/Makefile.predynamic
-target=lookups/Makefile
-defs_source=Makefile
+target=lookups/Makefile.postdynamic
+defs_source=Makefile-t
 tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE'
 
 tab='	'
@@ -44,20 +44,19 @@ export LC_ALL
 # nb: do not permit leading whitespace for this, as CFLAGS_DYNAMIC is exported
 # to the lookups subdir via a line with leading whitespace which otherwise
 # matches
-if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source"
+if grep -q "^CFLAGS_DYNAMIC[ $tab?:]*=" "$defs_source"
 then
   # we have a definition, we're good to go
+  echo >&2 ">>> Creating lookups/Makefile for building dynamic modules"
   enable_dynamic=yes
 else
-  echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup"
+  echo >&2 ">>> Creating lookups/Makefile without dynamic module support"
   enable_dynamic=''
   # We always do something now, since there should always be a lookup,
   # and now we need to run in order to put the OBJ=$(OBJ)+ rules in.  So we
   # continue on.
 fi
 
-tmp="$target.t"
-
 # For the want_ checks, we need to let the user override values from the make
 # command-line, not just check the Makefile.
 
@@ -77,6 +76,15 @@ want_at_all() {
   grep -q "^[ $tab]*$re" "$defs_source"
 }
 
+# Adapted want_at_all above to work for EXPERIMENTAL features
+want_experimental() {
+  local want_name="$1"
+  local re="EXPERIMENTAL_${want_name}[ $tab]*=[ $tab]*."
+  env | grep -q "^$re"
+  if [ $? -eq 0 ]; then return 0; fi
+  grep -q "^[ $tab]*$re" "$defs_source"
+}
+
 # The values of these variables will be emitted into the Makefile.
 
 MODS=""
@@ -96,7 +104,7 @@ emit_module_rule() {
   if want_dynamic "$lookup_name"
   then
     if [ -z "$enable_dynamic" ]; then
-      echo >&2 "Inhibited dynamic modules prevents building dynamic $lookup_name"
+      echo >&2 "Missing CFLAGS_DYNAMIC prevents building dynamic $lookup_name"
       exit 1
     fi
     MODS="${MODS} ${mod_name}.so"
@@ -116,8 +124,9 @@ emit_module_rule() {
   fi
 }
 
+rm -f "$target"
 exec 5>&1
-exec > "$tmp"
+exec > "$target"
 
 sed -n "1,/$tag_marker/p" < "$input"
 
@@ -139,13 +148,21 @@ fi
 
 OBJ="${OBJ} spf.o"
 
+# Because the variable is EXPERIMENTAL_REDIS and not LOOKUP_REDIS we
+# use a different function to check for EXPERIMENTAL_* features
+# requested. Don't use the SPF method with dummy functions above.
+if want_experimental REDIS
+then
+  OBJ="${OBJ} redis.o"
+fi
+
 echo "MODS = $MODS"
 echo "OBJ = $OBJ"
 
 sed -n "/$tag_marker/,\$p" < "$input"
 
 exec >&5
-mv "$tmp" "$target"
 
+# Configure-Makefile will move $target into place
 
 # vim: set ft=sh sw=2 :