X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=7b62449be81f4b0faac508bb9692695ee804d9fd;hp=9b4781c72f7602c2edd3f078cfa0945be26d1a35;hb=b267a6d20464a138cae916a676f2c382c51d52de;hpb=0f62019c34e546f7c069a3b9f46deaa4b1608276

diff --git a/autogen.sh b/autogen.sh
index 9b4781c72..7b62449be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,6 +50,10 @@ args="\
 --libdir=$(libdir /usr/lib) \
 $gtkdocargs"
 
+if [ -f "$topdir/.config.args" ]; then
+        args="$args $(cat $topdir/.config.args)"
+fi
+
 if [ ! -L /bin ]; then
 args="$args \
 --with-rootprefix= \
@@ -62,6 +66,9 @@ cd $oldpwd
 if [ "x$1" = "xc" ]; then
         $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
         make clean
+elif [ "x$1" = "xt" ]; then
+        $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus --enable-terminal $args
+        make clean
 elif [ "x$1" = "xg" ]; then
         $topdir/configure CFLAGS='-g -Og -ftrapv' --enable-compat-libs --enable-kdbus $args
         make clean
@@ -69,10 +76,10 @@ elif [ "x$1" = "xa" ]; then
         $topdir/configure CFLAGS='-g -O0 -Wsuggest-attribute=pure -Wsuggest-attribute=const -ftrapv' --enable-compat-libs --enable-kdbus $args
         make clean
 elif [ "x$1" = "xl" ]; then
-        $topdir/configure CC=clang CFLAGS='-g -O0 -ftrapv -Wno-gnu' --enable-compat-libs --enable-kdbus $args
+        $topdir/configure CC=clang CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
         make clean
 elif [ "x$1" = "xs" ]; then
-        scan-build $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
+        scan-build $topdir/configure CFLAGS='-std=gnu99 -g -O0 -ftrapv' --enable-kdbus $args
         scan-build make
 else
         echo