X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=f659fca5251b0213301c5d710c7d8bee3f3097b3;hp=4532e870bc93d8cd09451c40dafb8c880e406123;hb=c99b72121fb965920652ea5e7a1d7f962385626b;hpb=e407720bbaa718d97eefacb62ff96a7796f54281

diff --git a/autogen.sh b/autogen.sh
index 4532e870b..f659fca52 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,57 +1,35 @@
 #!/bin/sh -e
 
-(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
-}
-
-test -f udev/udevd.c || {
-	echo "You must run this script in the top-level source directory"
-	exit 1
-}
+gtkdocize
+autoreconf --install --symlink
 
-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
-
-if test -z "$@"; then
-	args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-	args="$args --with-libdir-name=$(basename $(gcc -print-multi-os-directory))"
-	export CFLAGS="-g -Wall \
+MYCFLAGS="-g -Wall \
 -Wmissing-declarations -Wmissing-prototypes \
 -Wnested-externs -Wpointer-arith \
 -Wpointer-arith -Wsign-compare -Wchar-subscripts \
--Wstrict-prototypes -Wshadow"
-else
-	args=$@
-fi
-echo "   configure:  $args"
-echo
-./configure $args
+-Wstrict-prototypes -Wshadow \
+-Wformat-security -Wtype-limits"
+
+case "$CFLAGS" in
+	*-O[0-9]*)
+		;;
+	*)
+		MYCFLAGS="$MYCFLAGS -O2"
+		;;
+esac
+
+libdir() {
+	echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
+
+args="--prefix=/usr \
+--sysconfdir=/etc \
+--sbindir=/sbin \
+--libdir=$(libdir /usr/lib) \
+--with-rootlibdir=$(libdir /lib) \
+--libexecdir=/lib/udev \
+--with-selinux \
+--enable-gtk-doc"
+
+export CFLAGS="$CFLAGS $MYCFLAGS"
+./configure $args $@