X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=7f9bbfc16fb5763d419a17cb3511dcf626059ab6;hp=926ca7ec9294eee4ca9fa4fdb9e2c7f406ab58f8;hb=d4ce8390c5aa345602b51099e9d3ed3b74d3ec4d;hpb=5d89ef7bf94d8a708a1159be22eb1cf458a1d101

diff --git a/autogen.sh b/autogen.sh
index 926ca7ec9..7f9bbfc16 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,80 +1,56 @@
-#!/bin/sh -e
+#!/bin/sh
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to generate the build system."
-	echo
-	exit 1
-}
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have libtool installed to generate the build system."
-	echo
-	exit 1
-}
-(autoheader --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoheader installed to generate the build system."
-	echo
-	exit 1
-}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to generate the build system."
-	echo
-	exit 1
-}
+#  This file is part of elogind
+#
+#  elogind 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.
+#
+#  elogind 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 elogind; If not, see <http://www.gnu.org/licenses/>.
 
-test -f udev/udevd.c || {
-	echo "You must run this script in the top-level source directory"
-	exit 1
+set -e
+
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
+
+intltoolize --force --automake
+autoreconf --force --install --symlink
+
+libdir() {
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
 }
 
-echo "   aclocal:    $(aclocal --version | head -1)"
-aclocal
-echo "   autoconf:   $(autoconf --version | head -1)"
-autoconf
-echo "   libtool:   $(automake --version | head -1)"
-libtoolize --force
-echo "   autoheader: $(autoheader --version | head -1)"
-autoheader
-echo "   automake:   $(automake --version | head -1)"
-automake --add-missing
+args="\
+--sysconfdir=/etc \
+--localstatedir=/var \
+--libdir=$(libdir /usr/lib) \
+"
+
+if [ -f "$topdir/.config.args" ]; then
+        args="$args $(cat $topdir/.config.args)"
+fi
 
-CFLAGS="-g -Wall \
--Wmissing-declarations -Wmissing-prototypes \
--Wnested-externs -Wpointer-arith \
--Wpointer-arith -Wsign-compare -Wchar-subscripts \
--Wstrict-prototypes -Wshadow"
+if [ ! -L /bin ]; then
+args="$args \
+--with-rootprefix=/ \
+--with-rootlibdir=$(libdir /lib) \
+"
+fi
 
-args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-libdir=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
+cd $oldpwd
 
-case "$1" in
-	*install|"")
-		args="$args --with-libdir-name=$libdir"
-		export CFLAGS="$CFLAGS -O2"
-		echo "   configure:  $args"
-		echo
-		./configure $args
-		;;
-	*devel)
-		args="$args --enable-debug --with-libdir-name=$libdir"
-		export CFLAGS="$CFLAGS -O0"
-		echo "   configure:  $args"
-		echo
-		./configure $args
-		;;
-	*clean)
-		./configure
-		make maintainer-clean
-		find . -name Makefile.in | xargs -r rm
-		rm -f depcomp aclocal.m4 config.h.in configure install-sh
-		rm -f missing config.guess config.sub ltmain.sh
-		exit 0
-		;;
-	*)
-		echo "Usage: $0 [--install|--devel|--clean]"
-		exit 1
-		;;
-esac
+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