Add host detail on all deferred deliveries, not only the last one

[users/jgh/exim.git] / src / scripts / lookups-Makefile

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 51fbd944b0836d9da04bfea7476cc680bff2e16f..db2d184a731a6995e89ee0c281893a41f5c8da6f 100755 (executable)
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -24,6 +24,22 @@ then
   _XPG=1
   export _XPG
 
   _XPG=1
   export _XPG
 

+  # We need the _right_ tr, so must do that first; but if a shell which
+  # we're more confident is sane is available, let's try that.  Mostly,
+  # the problem is that "local" is not actually in "the" standard, it's
+  # just in every not-insane shell.  Though arguably, there are no shells
+  # with POSIX-ish syntax which qualify as "not insane".
+  for b in /bin/dash /bin/bash /usr/local/bin/bash
+  do
+    if [ -x "$b" ]
+    then
+      SHELL="$b"
+      break
+    fi
+  done
+  # if we get a report of a system with zsh but not bash, we can add that
+  # to the list, but be sure to enable sh_word_split in that case.
+

   exec "$SHELL" "$0" "$@"
 fi
 
   exec "$SHELL" "$0" "$@"
 fi
 


@@ -41,6 +57,16 @@ tab='        '
 LC_ALL=C
 export LC_ALL
 
 LC_ALL=C
 export LC_ALL
 

+if [ -f "$defs_source" ]
+then
+  :
+  # we are happy
+else
+  echo >&2 "$0: ERROR: MISSING FILE '${defs_source}'"
+  echo >&2 "$0: SHOULD HAVE BEEN CALLED FROM scripts/Configure-Makefile"
+  exit 1
+fi
+

 # 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
 # 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


@@ -95,7 +121,10 @@ emit_module_rule() {
   local mod_name pkgconf
   if [ "${lookup_name%:*}" = "$lookup_name" ]
   then
   local mod_name pkgconf
   if [ "${lookup_name%:*}" = "$lookup_name" ]
   then

-    mod_name=$(echo $lookup_name | tr A-Z a-z)
+    # Square brackets are redundant but benign for POSIX compliant tr,
+    # however Solaris /usr/bin/tr requires them. Sometimes Solaris
+    # gets installed without a complete set of xpg4 tools, sigh.
+    mod_name=$(echo $lookup_name | tr [A-Z] [a-z])

   else
     mod_name="${lookup_name#*:}"
     lookup_name="${lookup_name%:*}"
   else
     mod_name="${lookup_name#*:}"
     lookup_name="${lookup_name%:*}"


@@ -132,7 +161,7 @@ sed -n "1,/$tag_marker/p" < "$input"
 
 for name_mod in \
     CDB DBM:dbmdb DNSDB DSEARCH IBASE LSEARCH MYSQL NIS NISPLUS ORACLE \
 
 for name_mod in \
     CDB DBM:dbmdb DNSDB DSEARCH IBASE LSEARCH MYSQL NIS NISPLUS ORACLE \

-    PASSWD PGSQL SQLITE TESTDB WHOSON
+    PASSWD PGSQL REDIS SQLITE TESTDB WHOSON

 do
   emit_module_rule $name_mod
 done
 do
   emit_module_rule $name_mod
 done


@@ -148,12 +177,9 @@ fi
 
 OBJ="${OBJ} spf.o"
 
 
 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
+if want_experimental LMDB

 then
 then

-  OBJ="${OBJ} redis.o"
+  OBJ="${OBJ} lmdb.o"

 fi
 
 echo "MODS = $MODS"
 fi
 
 echo "MODS = $MODS"