Changeset: 49fedb130ec6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49fedb130ec6
Modified Files:
configure.ag
monetdb5/modules/mal/mal_init.mal
Branch: headless
Log Message:
Merge with default branch.
diffs (32 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -512,13 +512,13 @@
enable_strict=$dft_strict)
dnl Set compiler switches.
dnl The idea/goal is to be as strict as possible, i.e., enable preferably
-dnl *all* warnings and make them errors. This should help keeping the code
+dnl *all* warnings and make them errors. This should help keep the code
dnl as clean and portable as possible.
dnl It turned out, though, that this, especially turning all warnings into
-dnl errors is a bit too ambitious for configure/autoconf. Hence, we set
+dnl errors, is a bit too ambitious for configure/autoconf. Hence, we set
dnl the standard CFLAGS to what configure/autoconf can cope with
dnl (basically everything except "-Werror"). For "-Werror" and some
-dnl switches that disable selected warnings that haven't been sorted out,
+dnl switches that disable selected warnings that haven't been sorted out
dnl yet, we set X_CFLAGS, which are added to the standard
dnl CFLAGS once configure/autoconf are done with their job,
dnl i.e., at the end of this configure[.ag] script.
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -88,7 +88,7 @@
include trader;
#include mat;
-include histogram;
+# include histogram;
include inspect;
include manual;
include language;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
