X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=55ee03afd14b562438d5f67030d7e336dd7a36a3;hp=5c5903e0eb2c3e50f0163215f3829edd1119fc41;hb=6997e3b2dc0095985071e2f7496342a850cdb5ad;hpb=bb0059f36e14cca41bdc242b13f39d57e8b7884d

diff --git a/autogen.sh b/autogen.sh
index 5c5903e0e..55ee03afd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,27 +1,44 @@
 #!/bin/sh -e
 
+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
+
 gtkdocize
 autoreconf --install --symlink
 
-MYCFLAGS="-g -Wall \
--Wmissing-declarations -Wmissing-prototypes \
--Wnested-externs -Wpointer-arith \
--Wpointer-arith -Wsign-compare -Wchar-subscripts \
--Wstrict-prototypes -Wshadow \
--Wformat=2 -Wtype-limits"
+libdir() {
+        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
 
-case "$CFLAGS" in
-	*-O[0-9]*)
-		;;
-	*)
-		MYCFLAGS="$MYCFLAGS -O2"
-		;;
-esac
+args="$args \
+--prefix=/usr \
+--sysconfdir=/etc \
+--libdir=$(libdir /usr/lib) \
+--with-selinux \
+--enable-gtk-doc"
 
-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 [ -L /bin ]; then
+args="$args \
+--libexecdir=/usr/lib \
+--with-systemdsystemunitdir=/usr/lib/systemd/system \
+"
+else
+args="$args \
+--with-rootprefix= \
+---with-rootlibdir=$(libdir /lib) \
+--bindir=/sbin \
+--libexecdir=/lib \
+--with-systemdsystemunitdir=/lib/systemd/system \
+"
+fi
 
-export CFLAGS="$CFLAGS $MYCFLAGS"
-./configure $args $@
+echo
+echo "----------------------------------------------------------------"
+echo "Initialized build system. For a common configuration please run:"
+echo "----------------------------------------------------------------"
+echo
+echo "./configure CFLAGS='-g -O1' $args"
+echo