diff options
| author |   Kay Sievers <kay@vrfy.org> | 2012-04-17 17:03:38 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-17 17:11:02 +0200 |
| commit | 80a5cbace45a6adbf2f9119edc5a4b10db493064 (patch) | |
| tree | ab0384a6f771f8caae15d6f9ce29b37d134eec7a /autogen.sh | |
| parent | build-sys: make gtk-doc dependency optional (diff) | |
| download | systemd-80a5cbace45a6adbf2f9119edc5a4b10db493064.tar.gz systemd-80a5cbace45a6adbf2f9119edc5a4b10db493064.tar.bz2 systemd-80a5cbace45a6adbf2f9119edc5a4b10db493064.zip | |
build-sys: silence gtk-doc check, remove gtk-doc options from configure and distcheck
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/autogen.sh b/autogen.sh index 869632abb..d27b5c676 100755 --- a/autogen.sh +++ b/autogen.sh @@ -21,17 +21,15 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activated pre-commit hook." fi -GTKDOCIZE=`which gtkdocize` +GTKDOCIZE=$(which gtkdocize 2>/dev/null) if test -z $GTKDOCIZE; then - echo "You don't have gtk-doc installed, and thus" - echo "won't be able to generate the documentation." - NOGTKDOC=1 + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." echo 'EXTRA_DIST =' > gtk-doc.make +else + gtkdocize + gtkdocargs=--enable-gtk-doc fi -if test -z "$NOGTKDOC"; then - gtkdocize || exit $? -fi intltoolize --force --automake autoreconf --force --install --symlink @@ -44,7 +42,7 @@ args="\ --localstatedir=/var \ --libdir=$(libdir /usr/lib) \ --libexecdir=/usr/lib \ ---enable-gtk-doc" +$gtkdocargs" if [ ! -L /bin ]; then args="$args \ |