diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-12 10:52:07 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-12 10:52:07 +0200 |
commit | 138f28aaafc3bd3087efbc25f49f752c66d14157 (patch) | |
tree | a2f83cbb692fc020ee1eb71379c94901989b8ff6 /configure | |
parent | 8f92276156b1fbdeebd085b731ed4aeab3960432 (diff) |
configure: do not use bash's expr match
It looks like there are some incompatibilities in bash's expr match
among different versions. Using set -x, gives us on bash 4.2.45:
+ TOOLS=' netsniff-ng trafgen ifpps bpfc'
+ for tool in '$_tools'
+ case "$tool" in
++ expr match '"curvetun' 'astraceroute"' '$1'
expr: syntax error
+ m=
+ '[' '' == 0 ']'
So rather avoid using "expr match" and switch to "case" for substring
matching, which should be more portable.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -25,15 +25,15 @@ trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM tools_remove() { local _tools=$TOOLS + local _todel=$1 TOOLS="" for tool in $_tools ; do case "$tool" in - $1) - m=`expr match \"$TOOLS_NOBUILD\" '$1'` - if [ "$m" == "0" ] ; then - TOOLS_NOBUILD="$TOOLS_NOBUILD $tool" - fi - ;; + $_todel) + case $_todel in + $TOOLS_NOBUILD) ;; + *) TOOLS_NOBUILD="$TOOLS_NOBUILD $tool" ;; + esac ;; *) TOOLS="$TOOLS $tool" ;; esac done |