Skip to content
Snippets Groups Projects
Commit 7132065b authored by Christian Engwer's avatar Christian Engwer
Browse files

[dunecontrol]

make m4create work with versioned suggestions

[[Imported from SVN: r6840]]
parent 8ae502d0
Branches
Tags
No related merge requests found
......@@ -749,6 +749,30 @@ case "$command" in
requires="$requires $depname $depver "
done
# get suggestions
eval sugs=\$SUGS_$mainmod
#initially remove leading space
sugs=`echo "$sugs" | sed 's/^ *//'`
while test -n "$sugs"; do
#the end of the name is marked either by space, opening paren
#or comma
sugsname="${sugs%%[ (,]*}"
#remove the name and adjacent whitespace
sugs=`echo "$sugs" | sed 's/^[^ (,]* *//'`
#check whether there is a dependency version
case "$sugs" in
'('*) sugs="${sugs#(}"
depver="${sugs%%)*}"
sugs="${sugs#*)}"
;;
*) sugver=
;;
esac
#remove any leading whitespace or commas for te next iteration
sugs=`echo "$sugs" | sed 's/^[, ]*//'`
suggests="$suggests $sugsname"
done
# ensure a version number
if test "x$version" = "x"; then version="0.0"; fi
echo "writing $fname"
......@@ -775,7 +799,7 @@ m4_define([DUNE_AC_INIT],[
AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [
EOF
### initialize AM_CONDITIONAL for suggestions that were not found
for name in $(eval echo \$SUGS_$mainmod); do
for name in $suggests; do
mod=$(fix_variable_name $name)
MOD=`echo $mod | tr [:lower:] [:upper:]`
if test "x$(eval echo \$HAVE_$mod)" = "x"; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment