X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=63c1997736e2715924c4b01b814ebe9615b2c65a;hp=ef3f579cbd3a200f3c86dedd19b5c2edeea6b284;hb=514b8d62123e3d63f2b935aa1d58e5c411f3f603;hpb=88608b1704ae8d701251614eb40c2e2e9e1f6d0e

diff --git a/autogen.sh b/autogen.sh
index ef3f579cb..63c199773 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,64 +1,19 @@
 #!/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
-}
-
-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"
+-Wstrict-prototypes -Wshadow \
+-Wformat=2 -Wtype-limits"
+
+libdirname=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
+args="--prefix=/usr --exec-prefix= --sysconfdir=/etc \
+--libdir=/usr/$libdirname --with-libdir-name=$libdirname \
+--with-selinux --enable-gtk-doc"
 
-if test -z "$1" -o "$1" = "install"; then
-	args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-	args="$args --with-libdir-name=lib/$(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=lib/$(gcc -print-multi-os-directory)"
-	CFLAGS="$CFLAGS -O0"
-else
-	args=$@
-fi
-echo "   configure:  $args"
-echo
-export CFLAGS
-./configure $args
+export CFLAGS="$CFLAGS -O2"
+./configure $args $@