X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7245734e71c1a30f1c25a2af279242de7d00c3b2..bf3e317e5a01916a351278597c6c0664ed198ddc:/src/scripts/lookups-Makefile diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile index d2caf70c8..63f3eb86e 100755 --- a/src/scripts/lookups-Makefile +++ b/src/scripts/lookups-Makefile @@ -24,6 +24,22 @@ then _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 @@ -41,6 +57,16 @@ tab=' ' 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 @@ -134,8 +160,8 @@ exec > "$target" sed -n "1,/$tag_marker/p" < "$input" for name_mod in \ - CDB DBM:dbmdb DNSDB DSEARCH IBASE LSEARCH MYSQL NIS NISPLUS ORACLE \ - PASSWD PGSQL SQLITE TESTDB WHOSON + CDB DBM:dbmdb DNSDB DSEARCH IBASE JSON LSEARCH MYSQL NIS NISPLUS ORACLE \ + PASSWD PGSQL REDIS SQLITE TESTDB WHOSON do emit_module_rule $name_mod done @@ -151,14 +177,14 @@ 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 +if want_experimental LMDB then - OBJ="${OBJ} redis.o" + OBJ="${OBJ} lmdb.o" fi +# readsock is always wanted as it implements the ${readsock } expansion +OBJ="${OBJ} readsock.o" + echo "MODS = $MODS" echo "OBJ = $OBJ"