X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=f99d0d031ff5b04c052249289e2bd0dda7c6d2e0;hp=3b9dd1fd166626e4f7fde0c6e3b2ca6c7142c5ac;hb=7c1b422919819e9e7af4652b52d5f122a090ce53;hpb=fbe224e2032cfbd9ea664a64c5254756ce5b5448

diff --git a/autogen.sh b/autogen.sh
index 3b9dd1fd1..f99d0d031 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,80 +1,64 @@
-#!/bin/bash
+#!/bin/sh
 
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  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
-#  General Public License for more details.
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
+#  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-AM_VERSION=1.11
-AC_VERSION=2.63
+set -e
 
-run_versioned() {
-    local P
-    local V
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
 
-    V=$(echo "$2" | sed -e 's,\.,,g')
+# 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
 
-    if [ -e "`which $1$V 2> /dev/null`" ] ; then
-        P="$1$V"
-    else
-        if [ -e "`which $1-$2 2> /dev/null`" ] ; then
-            P="$1-$2"
-        else
-            P="$1"
-        fi
-    fi
+intltoolize --force --automake
+autoreconf --force --install --symlink
 
-    shift 2
-    "$P" "$@"
+libdir() {
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
 }
 
-set -ex
+args="\
+--sysconfdir=/etc \
+--localstatedir=/var \
+--libdir=$(libdir /usr/lib) \
+"
 
-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."
+if [ -f "$topdir/.config.args" ]; then
+        args="$args $(cat $topdir/.config.args)"
 fi
 
-libdir() {
-    echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
-}
-
-if [ "x$1" = "xam" ] ; then
-    run_versioned automake "$AM_VERSION" -a -c --foreign
-    ./config.status
-else
-    rm -rf autom4te.cache
-    rm -f config.cache
+if [ ! -L /bin ]; then
+args="$args \
+--with-rootprefix=/ \
+--with-rootlibdir=$(libdir /lib) \
+"
+fi
 
-    libtoolize -c --force
-    intltoolize -c -f
-    run_versioned aclocal "$AM_VERSION" -I m4
-    run_versioned autoconf "$AC_VERSION" -Wall
-    run_versioned autoheader "$AC_VERSION"
-    run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
+cd $oldpwd
 
-    if [ "x$1" != "xac" ]; then
-        CFLAGS="$CFLAGS -g -O0" ./configure \
-          --with-rootprefix= \
-          --sysconfdir=/etc \
-          --localstatedir=/var \
-          --libdir=$(libdir /usr/lib) \
-          --with-rootlibdir=$(libdir /lib) \
-          --libexecdir=/usr/lib \
-          "$@"
-        make clean
-    fi
-fi
+echo
+echo "----------------------------------------------------------------"
+echo "Initialized build system. For a common configuration please run:"
+echo "----------------------------------------------------------------"
+echo
+echo "$topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-kdbus $args"
+echo