X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=3997db30e0de41921e4998a0dc65564b329c023b;hp=be88a8d6f37496485c23abb49c9423ed594f683c;hb=fb080b98edb9b1e106cd4b5315cb9d7ecaf20ad9;hpb=66be6554807773028a0111addb8e75c3cab11117 diff --git a/autogen.sh b/autogen.sh index be88a8d6f..3997db30e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This file is part of systemd. # @@ -15,50 +15,27 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . -if [ -f .git/hooks/pre-commit.sample -a ! -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." +set -e + +oldpwd=$(pwd) +topdir=$(dirname $0) +cd $topdir + +if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then + # This part is allowed to fail + 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 =' > gtk-doc.make +if which gtkdocize >/dev/null 2>/dev/null; then + gtkdocize --docdir docs/ --flavour no-tmpl + gtkdocargs=--enable-gtk-doc else - gtkdocize - gtkdocargs=--enable-gtk-doc + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." + rm -f docs/gtk-doc.make + 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) -} - -args="\ ---sysconfdir=/etc \ ---localstatedir=/var \ ---libdir=$(libdir /usr/lib) \ ---libexecdir=/usr/lib \ -$gtkdocargs" - -if [ ! -L /bin ]; then -args="$args \ ---with-rootprefix= \ ---with-rootlibdir=$(libdir /lib) \ -" -fi - -echo -echo "----------------------------------------------------------------" -echo "Initialized build system. For a common configuration please run:" -echo "----------------------------------------------------------------" -echo -echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args" -echo -if [ "x$1" == "xc" ]; then - ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args - make clean -fi