Changeset: 4831ff29cbc1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4831ff29cbc1
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
monetdb5/mal/mal.c
testing/Mtest.py.in
Branch: default
Log Message:
remove settings related to jsonstore
diffs (73 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -909,7 +909,6 @@ developer, but if you do want to test, t
--enable-gsl=yes \
--enable-instrument=no \
--enable-jdbc=no \
- --enable-jsonstore=no \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -221,9 +221,6 @@
#define HAVE_ISINF 1
#endif
-/* Define that you want to build the jsonstore library */
-/* #undef HAVE_JSONSTORE */
-
/* Define to 1 if you have the `kill' function. */
/* #undef HAVE_KILL */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -423,11 +423,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_JSONSTORE
- $(ECHO) HAVE_JSONSTORE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_JSONSTORE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -91,9 +91,6 @@ int mal_init(void){
initParser();
initHeartbeat();
initResource();
-#ifdef HAVE_JSONSTORE
- startHttpdaemon();
-#endif
RECYCLEinit();
if( malBootstrap() == 0)
return -1;
@@ -140,9 +137,6 @@ void mal_exit(void){
}
#endif
setHeartbeat(0);
-#ifdef HAVE_JSONSTORE
- stopHttpdaemon();
-#endif
stopMALdataflow();
stopProfiler();
RECYCLEdrop(mal_clients); /* remove any left over intermediates */
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -303,7 +303,6 @@ CONDITIONALS = {
'HAVE_JAVA' : "@HAVE_JAVA_FALSE@",
'HAVE_JAVAJDBC' : "@HAVE_JAVAJDBC_FALSE@",
'HAVE_JAVAMEROCONTROL' : "@HAVE_JAVAMEROCONTROL_FALSE@",
- 'HAVE_JSONSTORE' : "@HAVE_JSONSTORE_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
