Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Koch
dune-common
Commits
7132065b
Commit
7132065b
authored
12 years ago
by
Christian Engwer
Browse files
Options
Downloads
Patches
Plain Diff
[dunecontrol]
make m4create work with versioned suggestions [[Imported from SVN: r6840]]
parent
8ae502d0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/dunecontrol
+25
-1
25 additions, 1 deletion
bin/dunecontrol
with
25 additions
and
1 deletion
bin/dunecontrol
+
25
−
1
View file @
7132065b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment