summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rwxr-xr-xautogen.sh12
2 files changed, 10 insertions, 3 deletions
diff --git a/TODO b/TODO
index d1ae2d7ae3..e3631837cb 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
- o CFLAGS debug
o cleanup old extras which link libudev source directly
o fix configure options and libdir-name, exec-prefix, udev-prefix, libdir, ...
diff --git a/autogen.sh b/autogen.sh
index 63c1997736..5c5903e0eb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,17 +3,25 @@
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"
+case "$CFLAGS" in
+ *-O[0-9]*)
+ ;;
+ *)
+ MYCFLAGS="$MYCFLAGS -O2"
+ ;;
+esac
+
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"
-export CFLAGS="$CFLAGS -O2"
+export CFLAGS="$CFLAGS $MYCFLAGS"
./configure $args $@