2012/7/25 Mantas Mikulėnas <graw...@gmail.com>:
> The failing check caused autogen.sh to die mysteriously due to `set -e`
> and the unquoted `test -z $VAR`.
>
> Also, some syntax fixes to make it work with /bin/sh, which most other
> autogen.sh's use.
> ---
> autogen.sh | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/autogen.sh b/autogen.sh
> index bec43fa..fda9932 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>
> # This file is part of systemd.
> #
> @@ -17,26 +17,25 @@
>
> set -e
>
> -if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
> +if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ];
> then
> cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
> chmod +x .git/hooks/pre-commit && \
> echo "Activated pre-commit hook."
> fi
>
> -GTKDOCIZE=$(which gtkdocize 2>/dev/null)
> -if test -z $GTKDOCIZE; then
> - echo "You don't have gtk-doc installed, and thus won't be able to
> generate the documentation."
> - echo 'EXTRA_DIST =' > docs/gtk-doc.make
> -else
> +if GTKDOCIZE=$(which gtkdocize 2>/dev/null); then
afaik you can just drop GTKDOCIZE, it is not used anywhere i can see.
this would then be
+if which gtkdocize &>/dev/null; then
> gtkdocize --docdir docs/
> gtkdocargs=--enable-gtk-doc
> +else
> + echo "You don't have gtk-doc installed, and thus won't be able to
> generate the documentation."
> + echo 'EXTRA_DIST =' > docs/gtk-doc.make
> fi
>
> intltoolize --force --automake
> autoreconf --force --install --symlink
>
> libdir() {
> - echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
> + echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
> }
>
> args="\
> @@ -52,7 +51,7 @@ args="$args \
> "
> fi
>
> -if [ "x$1" == "xc" ]; then
> +if [ "x$1" = "xc" ]; then
> ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
> make clean
> else
> --
> 1.7.12.rc0
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
