diff options
| author | Jan Schmidt <jan@centricular.com> | 2016-09-10 20:00:24 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-09-10 20:00:24 +1000 |
| commit | f980fd91c1c1fd01333966041a4a535366e897bd (patch) | |
| tree | fa178db827ff623fde618a21509394926c5f1da9 | |
| parent | b18d820635185eb549530af1ce406937141b2dd9 (diff) | |
Revert "gst-autogen.sh: Handle multiword arguments better"
This reverts commit b18d820635185eb549530af1ce406937141b2dd9.
Causes problems for distros with /bin/sh = dash
| -rwxr-xr-x | autogen.sh.in | 2 | ||||
| -rw-r--r-- | gst-autogen.sh | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/autogen.sh.in b/autogen.sh.in index 6300e56..170ac15 100755 --- a/autogen.sh.in +++ b/autogen.sh.in @@ -49,7 +49,7 @@ elif test "x$package" = "xgst-plugins-bad"; then CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-player-tests" fi -autogen_options "$@" +autogen_options $@ printf "+ check for build tools" if test -z "$NOCHECK"; then diff --git a/gst-autogen.sh b/gst-autogen.sh index 6feb9f2..71049e6 100644 --- a/gst-autogen.sh +++ b/gst-autogen.sh @@ -6,11 +6,7 @@ if [ -f "autoregen.sh" ]; then rm autoregen.sh fi echo "#!/bin/sh" > autoregen.sh -echo -n "./autogen.sh " >> autoregen.sh -for v in "$@"; do - echo -n "\"$v\" " >> autoregen.sh -done -echo "\$@" >> autoregen.sh +echo "./autogen.sh $@ \$@" >> autoregen.sh chmod +x autoregen.sh # helper functions for autogen.sh @@ -81,13 +77,13 @@ autogen_options () --) shift ; break ;; *) echo "+ passing argument $1 to configure" - CONFIGURE_EXT_OPT=("$CONFIGURE_EXT_OPT" "$1") + CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1" shift ;; esac done - for arg do CONFIGURE_EXT_OPT=("$CONFIGURE_EXT_OPT" "$arg"); done + for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done if test ! -z "$CONFIGURE_EXT_OPT" then echo "+ options passed to configure: $CONFIGURE_EXT_OPT" |