X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=582a8a3af495bc6c17d0949cfff141f9eddbad0b;hp=b4c853f9775ab05b0bb8bcbdd186c8f08ce8b7e0;hb=d914e44509abf8bf305d00ebc5c6282dd84e809b;hpb=b929e83acc964cc1648f5f536f1a776f8d8add46

diff --git a/autogen.sh b/autogen.sh
index b4c853f97..582a8a3af 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,64 +1,36 @@
-#!/bin/sh -e
+#!/usr/bin/env 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
-}
+set -e
 
-test -f udev/udevd.c || {
-	echo "You must run this script in the top-level source directory"
-	exit 1
-}
+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
 
-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
+gtkdocize
+autoreconf --install --symlink
 
-CFLAGS="-g -Wall \
--Wmissing-declarations -Wmissing-prototypes \
--Wnested-externs -Wpointer-arith \
--Wpointer-arith -Wsign-compare -Wchar-subscripts \
--Wstrict-prototypes -Wshadow"
+libdir() {
+	echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
 
-if test -z "$1" -o "$1" = "install"; then
-	args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-	args="$args --with-libdir-name=$(basename $(gcc -print-multi-os-directory))"
-	CFLAGS="$CFLAGS -O2"
-elif test "$1" = "devel" ; then
-	args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux --enable-debug"
-	args="$args --with-libdir-name=$(basename $(gcc -print-multi-os-directory))"
-	CFLAGS="$CFLAGS -O0"
-else
-	args=$@
-fi
-echo "   configure:  $args"
+args="\
+--prefix=/usr \
+--with-rootprefix= \
+--sysconfdir=/etc \
+--bindir=/sbin \
+--libdir=$(libdir /usr/lib) \
+--with-rootlibdir=$(libdir /lib) \
+--libexecdir=/lib \
+--with-systemdsystemunitdir=/lib/systemd/system \
+--with-selinux \
+--enable-gtk-doc"
+
+echo
+echo "---------------------------------------------------------------------"
+echo "Initialized udev build system. For a common configuration please run:"
+echo "---------------------------------------------------------------------"
+echo
+echo "# ./configure $args"
 echo
-export CFLAGS
-./configure $args