Update of /cvsroot/monetdb/MonetDB4/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20466/src/tools

Modified Files:
        Makefile.ag embeddedclient.mx 
Removed Files:
        monetdb4-config.bat.in monetdb4-config.in 
Log Message:
propagated changes of Friday Sep 28 2007 - Wednesday Oct 03 2007
from the MonetDB_4-20 branch to the development trunk


--- monetdb4-config.in DELETED ---

Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/Makefile.ag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.ag 31 Aug 2007 15:55:44 -0000      1.7
+++ Makefile.ag 3 Oct 2007 13:55:18 -0000       1.8
@@ -107,17 +107,4 @@
                ../monet/libmonet $(MONETDB_LIBS) $(CLIENTS_LIBS) -lbat 
-lmutils -lMapi -lstream
 }
 
-scripts_sh = {
-       COND = NOT_WIN32
-       EXT = ""
-       DIR = bindir
-       SOURCES = monetdb4-config.in
-}
-
-scripts_bat = {
-       COND = NATIVE_WIN32
-       DIR = bindir
-       SOURCES = monetdb4-config.bat.in 
-}
-
 EXTRA_DIST_DIR = Tests

--- monetdb4-config.bat.in DELETED ---

Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/embeddedclient.mx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- embeddedclient.mx   19 Jan 2007 14:41:14 -0000      1.3
+++ embeddedclient.mx   3 Oct 2007 13:55:18 -0000       1.4
@@ -59,7 +59,7 @@
 #endif
 
 #include <streams.h>
-#include <Mapi.h>
+#include <mapilib/Mapi.h>
 
 embeddedclient_export Mapi embedded_mil(opt *set, int len);
 
@@ -70,7 +70,7 @@
 #include "monet.h"
 #include "monet_options.h"
 #include "initmodules.h"
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
 
 
 static Client


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to