git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compatibility fixes for dynlookup makefile builder.
[users/heiko/exim.git]
/
src
/
scripts
/
lookups-Makefile
diff --git
a/src/scripts/lookups-Makefile
b/src/scripts/lookups-Makefile
index 7069cfb6966ea148e7b99715fad242a1b32bb5d5..959d49e118c4dd3633d81649d6a5fb58eeeeedcc 100755
(executable)
--- a/
src/scripts/lookups-Makefile
+++ b/
src/scripts/lookups-Makefile
@@
-2,27
+2,32
@@
# We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile
# We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile
+if [ -x /usr/xpg4/bin/sh ] && [ -z "EXIM_BLOCK_XPG4_LOOP" ]
+then
+ EXIM_BLOCK_XPG4_LOOP=yes
+ export EXIM_BLOCK_XPG4_LOOP
+ PATH="/usr/xpg4/bin:$PATH"
+ export PATH
+ exec /usr/xpg4/bin/sh "$@"
+fi
+
input=lookups/Makefile.predynamic
target=lookups/Makefile
defs_source=Makefile
tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE'
tab=' '
input=lookups/Makefile.predynamic
target=lookups/Makefile
defs_source=Makefile
tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE'
tab=' '
-if grep -q "^LOOKUP.*=[ $tab]*2" "$defs_source"
-then
- # we have work to do
-else
- echo "No dynamic module loading support"
- cp "$input" "$target"
- exit 0
-fi
+
+# We always do something now, since there should always be a lookup,
+# and now we need to run in order to put the OBJ+= rules in.
if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source"
then
# we have a definition, we're good to go
if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source"
then
# we have a definition, we're good to go
+ enable_dynamic=yes
else
echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup"
else
echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup"
- e
xit 1
+ e
nable_dynamic=''
fi
tmp="$target.t"
fi
tmp="$target.t"
@@
-50,7
+55,12
@@
emit_module_rule() {
if want_dynamic "$lookup_name"
then
if want_dynamic "$lookup_name"
then
+ if [ -z "$enable_dynamic" ]; then
+ echo >&2 "Inhibited dynamic modules prevents building dynamic $lookup_name"
+ exit 1
+ fi
echo "MODS += ${mod_name}.so"
echo "MODS += ${mod_name}.so"
+ grep "^LOOKUP_${lookup_name}_" "$defs_source"
echo "LOOKUP_${mod_name}_INCLUDE = \$(LOOKUP_${lookup_name}_INCLUDE)"
echo "LOOKUP_${mod_name}_LIBS = \$(LOOKUP_${lookup_name}_LIBS)"
elif want_at_all "$lookup_name"
echo "LOOKUP_${mod_name}_INCLUDE = \$(LOOKUP_${lookup_name}_INCLUDE)"
echo "LOOKUP_${mod_name}_LIBS = \$(LOOKUP_${lookup_name}_LIBS)"
elif want_at_all "$lookup_name"