MonetDB: Aug2011 - Merge with Apr2011 branch.

[Stefan Manegold]

Changeset: 86ad2c160ec2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86ad2c160ec2
Modified Files:
        configure.ag
Branch: Aug2011
Log Message:

Merge with Apr2011 branch.


diffs (19 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -569,9 +569,14 @@
                ;;
        esac
        case "$CC-$gcc_ver" in
+       *clang*-*|*-4.[[3-9]].*|*-[[5-9]].*)
+               dnl this triggers a warning (-> error) with gcc < 4.3
+               X_CFLAGS="$X_CFLAGS -Wstack-protector"
+               ;;
+       esac
+       case "$CC-$gcc_ver" in
        *clang*-*|*-3.[[5-9]].*|*-[[4-9]].*)
                dnl gcc < 3.5 does not know these
-               X_CFLAGS="$X_CFLAGS -Wstack-protector"
                X_CFLAGS="$X_CFLAGS -Wvariadic-macros"
                ;;
        esac
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list