[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - Merge with Jan2014 branch.
From:       Sjoerd Mullender <commits () monetdb ! org>
Date:       2014-02-28 18:22:29
Message-ID: hg.27ec0184a784.1393611749.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: 27ec0184a784 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27ec0184a784
Removed Files:
	buildtools/ChangeLog.Jul2012
	clients/ChangeLog.Jul2012
	gdk/ChangeLog.Jul2012
	geom/ChangeLog.Jul2012
	java/ChangeLog.Jul2012
	monetdb5/ChangeLog.Jul2012
	sql/ChangeLog.Jul2012
	testing/ChangeLog.Jul2012
	tools/merovingian/ChangeLog.Jul2012
Modified Files:
	buildtools/ChangeLog.Jan2014
	configure.ag
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (94 lines):

diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,3 +1,6 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
+* Fri Feb 28 2014 Sjoerd Mullender <sjoerd@acm.org>
+- Configure now enables the SQL front end by default.
+
diff --git a/buildtools/ChangeLog.Jul2012 b/buildtools/ChangeLog.Jul2012
deleted file mode 100644
--- a/buildtools/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for buildtools
-# This file is updated with Maddlog
-
diff --git a/clients/ChangeLog.Jul2012 b/clients/ChangeLog.Jul2012
deleted file mode 100644
--- a/clients/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for clients
-# This file is updated with Maddlog
-
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -179,7 +179,7 @@ AC_ARG_ENABLE(fits,
 	enable_fits=$enableval,
 	enable_fits=$dft_fits)
 
-dft_sql=auto
+dft_sql=yes
 AC_ARG_ENABLE(sql,
 	AS_HELP_STRING([--enable-sql],
 		[enable support for MonetDB/SQL (default=auto)]),
diff --git a/gdk/ChangeLog.Jul2012 b/gdk/ChangeLog.Jul2012
deleted file mode 100644
--- a/gdk/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB
-# This file is updated with Maddlog
-
diff --git a/geom/ChangeLog.Jul2012 b/geom/ChangeLog.Jul2012
deleted file mode 100644
--- a/geom/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for geom
-# This file is updated with Maddlog
-
diff --git a/java/ChangeLog.Jul2012 b/java/ChangeLog.Jul2012
deleted file mode 100644
--- a/java/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for java
-# This file is updated with Maddlog
-
diff --git a/monetdb5/ChangeLog.Jul2012 b/monetdb5/ChangeLog.Jul2012
deleted file mode 100644
--- a/monetdb5/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB5
-# This file is updated with Maddlog
-
diff --git a/sql/ChangeLog.Jul2012 b/sql/ChangeLog.Jul2012
deleted file mode 100644
--- a/sql/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for sql
-# This file is updated with Maddlog
-
diff --git a/testing/ChangeLog.Jul2012 b/testing/ChangeLog.Jul2012
deleted file mode 100644
--- a/testing/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for testing
-# This file is updated with Maddlog
-
diff --git a/tools/merovingian/ChangeLog.Jul2012 b/tools/merovingian/ChangeLog.Jul2012
deleted file mode 100644
--- a/tools/merovingian/ChangeLog.Jul2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for sql/src/backends/monet5/merovingian
-# This file is updated with mchangelog
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]