MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: 3867df1b44f7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3867df1b44f7
Modified Files:
        clients/Makefile.ag
        sql/backends/monet5/gsl/Makefile.ag
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (32 lines):

diff --git a/sql/backends/monet5/gsl/Makefile.ag 
b/sql/backends/monet5/gsl/Makefile.ag
--- a/sql/backends/monet5/gsl/Makefile.ag
+++ b/sql/backends/monet5/gsl/Makefile.ag
@@ -23,28 +23,24 @@ INCLUDES = ../../../../monetdb5/mal \
 
 lib__gsl = {
        MODULE
-       COND = HAVE_GSL
        DIR = libdir/monetdb5
        SOURCES = gsl.c
        LIBS = $(gsl_LIBS)
 }
 
 headers_gslmal = {
-       COND = HAVE_GSL
        HEADERS = mal
        DIR = libdir/monetdb5
        SOURCES = gsl.mal
 }
 
 headers_gslautoload = {
-    COND = HAVE_GSL
     HEADERS = mal
     DIR = libdir/monetdb5/autoload
     SOURCES = 73_gsl.mal
 }
 
 headers_gsl = {
-       COND = HAVE_GSL
        HEADERS = sql
        DIR = libdir/monetdb5/createdb
        SOURCES = 46_gsl.sql
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list