Changeset: fb80bac7b2e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb80bac7b2e0
Modified Files:
MonetDB.spec
configure.ag
debian/rules
Branch: Dec2016
Log Message:
A couple of configuration fixes.
diffs (57 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -849,7 +849,6 @@ developer, but if you do want to test, t
--enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
--enable-mapi=yes \
- --enable-microhttpd=no \
--enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
@@ -870,7 +869,8 @@ developer, but if you do want to test, t
--with-openssl=yes \
--with-proj=no \
--with-pthread=yes \
- --with-python=yes \
+ --with-python2=yes \
+ --with-python3=yes \
--with-readline=yes \
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
--with-sphinxclient=no \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3060,7 +3060,6 @@ for comp in \
'netcdf ' \
'openssl ' \
'pcre ' \
- 'perl ' \
'proj ' \
'pthread ' \
'python2 ' \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ override_dh_auto_configure:
--enable-instrument=no \
--enable-lidar=yes \
--enable-mapi=yes \
- --enable-microhttpd=no \
--enable-monetdb5=yes \
--enable-netcdf=no \
--enable-odbc=yes \
@@ -46,11 +45,10 @@ override_dh_auto_configure:
--with-libxml2=yes \
--with-lzma=yes \
--with-openssl=yes \
- --with-perl=yes \
- --with-perl-libdir=lib/perl5 \
--with-proj=no \
--with-pthread=yes \
- --with-python=yes \
+ --with-python2=yes \
+ --with-python3=yes \
--with-readline=yes \
--with-samtools=yes \
--with-sphinxclient=no \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
