X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=7a09c44dbc4d2502869881cac3c676849e181e6f;hp=826d9b0d0e1a423dd91d616f5b0de37bd51d7cd5;hb=ebda471d898063887008ede9811ffbe1acbc38e5;hpb=61fbbab8697ec62cdedc08efdbb8da1c875ce2a1;ds=sidebyside

diff --git a/autogen.sh b/autogen.sh
index 826d9b0d0..7a09c44db 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,8 +2,6 @@
 
 #  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
@@ -17,56 +15,37 @@
 #  You should have received a copy of the GNU General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-AM_VERSION=1.11
-AC_VERSION=2.63
-
-run_versioned() {
-    local P
-    local V
-
-    V=$(echo "$2" | sed -e 's,\.,,g')
-
-    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
-
-    shift 2
-    "$P" "$@"
-}
-
-set -ex
-
 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
 
-if type -p colorgcc > /dev/null ; then
-   export CC=colorgcc
-fi
-
-if [ "x$1" = "xam" ] ; then
-    run_versioned automake "$AM_VERSION" -a -c --foreign
-    ./config.status
-else
-    rm -rf autom4te.cache
-    rm -f config.cache
+intltoolize --force --automake
+autoreconf --force --install --symlink
 
-    libtoolize -c --force
-    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
+libdir() {
+    echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
 
-    if [ "x$1" != "xac" ]; then
-        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --with-rootdir= --libexecdir=/usr/lib "$@"
-        make clean
-    fi
+args="\
+--with-rootprefix= \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--libdir=$(libdir /usr/lib) \
+--with-rootlibdir=$(libdir /lib) \
+--libexecdir=/usr/lib"
+
+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
+else
+    echo ./configure CFLAGS='-g -O0' $args
+    ./configure CFLAGS='-g -O0' $args
+    make clean
 fi