Changeset: 7453af881b34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7453af881b34
Modified Files:
configure.ag
sql/backends/monet5/embeddedclient.c.in
sql/backends/monet5/prog.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
build-sys: expel MONETDB5_CONFFILE
It shouldn't be necessary any more. Merovingian is on purpose crippled
here, larger changes there are in the pipe that deal with this change.
diffs (68 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3040,11 +3040,6 @@
AC_DEFINE_UNQUOTED(SYSCONFDIR,"$QXsysconfdir",[read-only single-machine data])
AC_SUBST([MERO_LOG], [${localstatedir}/log/monetdb/merovingian.log])
AC_DEFINE_UNQUOTED([MERO_LOG],
["${localstatedir}/log/monetdb/merovingian.log"], [where Merovingian will store
its logs by default])
-# expand ${prefix} in ${sysconfdir} if using the default
-MONETDB5_CONFFILE="${sysconfdir}/monetdb5.conf"
-# expand ${prefix} in ${sysconfdir} if using the default
-eval "eval MONETDB5_CONFFILE=${MONETDB5_CONFFILE}"
-AC_DEFINE_UNQUOTED(MONETDB5_CONFFILE, "$MONETDB5_CONFFILE", [MonetDB5 config
file location])
dnl On Solaris, libxml2 enables threading only when _REENTRANT, __MT__
dnl or _POSIX_C_SOURCE >= 199506L is defined. The latter is only
diff --git a/sql/backends/monet5/embeddedclient.c.in
b/sql/backends/monet5/embeddedclient.c.in
--- a/sql/backends/monet5/embeddedclient.c.in
+++ b/sql/backends/monet5/embeddedclient.c.in
@@ -154,11 +154,6 @@
int len = mo_builtin_settings(&embedded_set);
/* needed, to prevent the MonetDB config file to be used */
- len = mo_add_option(&embedded_set, len, opt_config, "prefix", PREFIX);
- len = mo_add_option(&embedded_set, len, opt_config, "config",
MONETDB5_CONFFILE);
- len = mo_add_option(&embedded_set, len, opt_config, "monet_mod_path",
-
"@QXlibdir@@QDIRSEP@MonetDB5@PATHSEP@@QXlibdir@@QDIRSEP@MonetDB5@QDIRSEP@lib@PATHSEP@@QXlibdir@@QDIRSEP@MonetDB5@QDIRSEP@bin");
-
embedded_len = mo_system_config(&embedded_set, len);
embedded_len = mo_add_option(&embedded_set, embedded_len, opt_cmdline,
"gdk_dbfarm", dbfarm);
embedded_len = mo_add_option(&embedded_set, embedded_len, opt_cmdline,
"gdk_dbname", dbname);
diff --git a/sql/backends/monet5/prog.c b/sql/backends/monet5/prog.c
--- a/sql/backends/monet5/prog.c
+++ b/sql/backends/monet5/prog.c
@@ -113,10 +113,6 @@
if (!(setlen = mo_builtin_settings(&set)))
usage(prog);
- /* needed to prevent the MonetDB config file from being used */
- setlen = mo_add_option(&set, setlen, opt_config, "prefix", PREFIX);
- setlen = mo_add_option(&set, setlen, opt_config, "config",
MONETDB5_CONFFILE);
-
for (;;) {
int option_index = 0;
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1379,7 +1379,7 @@
* specify where to look using the MONETDB5CONF environment variable */
p = getenv("MONETDB5CONF");
if (p == NULL)
- p = MONETDB5_CONFFILE;
+ p = NULL;
cnf = fopen(p, "r");
if (cnf == NULL) {
fprintf(stderr, "cannot open config file %s\n", p);
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -466,7 +466,7 @@
* specify where to look using the MONETDB5CONF environment variable */
p = getenv("MONETDB5CONF");
if (p == NULL)
- p = MONETDB5_CONFFILE;
+ p = NULL;
cnf = fopen(p, "r");
if (cnf == NULL) {
Mfprintf(stderr, "cannot open config file %s\n", p);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
