X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=ba956694266dbd5f4ce2c65e24a2bcfac74dab20;hp=fb96d4aeb133885478915ac494739ee3ed712cae;hb=636c7a44d5143fdca298cb9087a529aa1d71c431;hpb=9dc4a84a255107cb9eea906e1de3f546c26bc55c

diff --git a/autogen.sh b/autogen.sh
index fb96d4aeb..ba9566942 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,35 @@
 #!/bin/sh -e
 
+gtkdocize
 autoreconf --install --symlink
 
-CFLAGS="-g -Wall \
+MYCFLAGS="-g -Wall \
 -Wmissing-declarations -Wmissing-prototypes \
 -Wnested-externs -Wpointer-arith \
 -Wpointer-arith -Wsign-compare -Wchar-subscripts \
 -Wstrict-prototypes -Wshadow \
--Wformat=2 -Wtype-limits"
-args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-libdir=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
+-Wformat-security -Wtype-limits"
 
-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
-		git clean -f -X
-		exit 0
+case "$CFLAGS" in
+	*-O[0-9]*)
 		;;
 	*)
-		echo "Usage: $0 [--install|--devel|--clean]"
-		exit 1
+		MYCFLAGS="$MYCFLAGS -O2"
 		;;
 esac
+
+libdir() {
+	echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
+
+args="--prefix=/usr \
+--sysconfdir=/etc \
+--bindir=/usr/bin \
+--sbindir=/usr/sbin \
+--libdir=$(libdir /usr/lib) \
+--libexecdir=/usr/lib/udev \
+--with-systemdsystemunitdir=/usr/lib/systemd/system
+--with-selinux \
+--enable-gtk-doc"
+
+./configure $args CFLAGS="${CFLAGS} ${MYCFLAGS}" $@