X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=f99d0d031ff5b04c052249289e2bd0dda7c6d2e0;hp=697ed919d2ef50c41534de11bba4c14343d2dfb6;hb=cef97d1ca84a5501668e650767ffbc95543866a9;hpb=912541b0246ef315d4d851237483b98c9dd3f992

diff --git a/autogen.sh b/autogen.sh
index 697ed919d..f99d0d031 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,34 +1,64 @@
-#!/bin/sh -e
+#!/bin/sh
 
-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
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
 
-gtkdocize
-autoreconf --install --symlink
+# We do not need this, we are not systemd upstream!
+#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)
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
 }
 
 args="\
---prefix=/usr \
---with-rootprefix= \
 --sysconfdir=/etc \
---bindir=/sbin \
+--localstatedir=/var \
 --libdir=$(libdir /usr/lib) \
+"
+
+if [ -f "$topdir/.config.args" ]; then
+        args="$args $(cat $topdir/.config.args)"
+fi
+
+if [ ! -L /bin ]; then
+args="$args \
+--with-rootprefix=/ \
 --with-rootlibdir=$(libdir /lib) \
---libexecdir=/lib \
---with-systemdsystemunitdir=/lib/systemd/system \
---with-selinux \
---enable-gtk-doc"
+"
+fi
+
+cd $oldpwd
 
 echo
 echo "----------------------------------------------------------------"
 echo "Initialized build system. For a common configuration please run:"
 echo "----------------------------------------------------------------"
 echo
-echo "./configure CFLAGS='-g -O0' $args"
+echo "$topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-kdbus $args"
 echo