X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=3997db30e0de41921e4998a0dc65564b329c023b;hp=869632abb09886ffda98827e0ca89a94c66e9827;hb=1918e5df007ce782ee6e6d6da04756d9aa6c18b5;hpb=92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2

diff --git a/autogen.sh b/autogen.sh
index 869632abb..3997db30e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #  This file is part of systemd.
 #
@@ -15,54 +15,27 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-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."
-fi
+set -e
 
-GTKDOCIZE=`which gtkdocize`
-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 'EXTRA_DIST =' > gtk-doc.make
-fi
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
 
-if test -z "$NOGTKDOC"; then
-    gtkdocize || exit $?
+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
-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 \
---enable-gtk-doc"
 
-if [ ! -L /bin ]; then
-args="$args \
---with-rootprefix= \
---with-rootlibdir=$(libdir /lib) \
-"
-fi
-
-if [ "x$1" != "xc" ]; then
-    echo
-    echo "----------------------------------------------------------------"
-    echo "Initialized build system. For a common configuration please run:"
-    echo "----------------------------------------------------------------"
-    echo
-    echo "./configure CFLAGS='-g -O0' $args"
-    echo
+if which gtkdocize >/dev/null 2>/dev/null; then
+        gtkdocize --docdir docs/ --flavour no-tmpl
+        gtkdocargs=--enable-gtk-doc
 else
-    echo ./configure CFLAGS='-g -O0' $args
-    ./configure CFLAGS='-g -O0' $args
-    make clean
+        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