Changeset: 886d87916d39 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=886d87916d39 Modified Files: MonetDB5/NT/rules.msc MonetDB5/src/mal/mal_linker.mx MonetDB5/src/mal/mal_sabaoth.mx MonetDB5/src/modules/mal/mdb.mx MonetDB5/src/modules/mal/replication.mx buildtools/conf/winrules.msc Branch: default Log Message:
Fixes for changeset db019c451509. dirent.h doesn't exist on Windows, so add #ifdef HAVE_DIRENT_H. Now that we use pkg-config for MonetDB5, also fix up Makefile variables on Windows. How hard is it to do a grep over the complete sources? diffs (104 lines): diff -r fa797514e587 -r 886d87916d39 MonetDB5/NT/rules.msc --- a/MonetDB5/NT/rules.msc Thu Nov 25 14:25:57 2010 +0100 +++ b/MonetDB5/NT/rules.msc Thu Nov 25 15:36:31 2010 +0100 @@ -37,11 +37,13 @@ MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include\MonetDB -MONETDB_INCS=-I"$(MONETDB_INCLUDEDIR)" -I"$(MONETDB_INCLUDEDIR)\common" -I"$(MONETDB_INCLUDEDIR)\gdk" -MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib" +monetdbcommon_CFLAGS=-I"$(MONETDB_INCLUDEDIR)" -I"$(MONETDB_INCLUDEDIR)\common" -I"$(MONETDB_INCLUDEDIR)\gdk" +monetdbcommon_LIBS=/libpath:"$(MONETDB_PREFIX)\lib" libbat.lib +monetdbstream_CFLAGS=-I"$(MONETDB_INCLUDEDIR)\common" +monetdbstream_LIBS=/libpath:"$(MONETDB_PREFIX)\lib" libstream.lib MONETDB_MODS=/libpath:"$(MONETDB_PREFIX)\lib\MonetDB" CLIENTS_INCLUDEDIR=$(CLIENTS_PREFIX)\include\MonetDB -CLIENTS_INCS=-I"$(CLIENTS_INCLUDEDIR)" -CLIENTS_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib" +monetdbmapi_CFLAGS=-I"$(CLIENTS_INCLUDEDIR)\mapilib" +monetdbmapi_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib" libMapi.lib diff -r fa797514e587 -r 886d87916d39 MonetDB5/src/mal/mal_linker.mx --- a/MonetDB5/src/mal/mal_linker.mx Thu Nov 25 14:25:57 2010 +0100 +++ b/MonetDB5/src/mal/mal_linker.mx Thu Nov 25 15:36:31 2010 +0100 @@ -96,7 +96,9 @@ #include "mal_import.h" /* for slash_2_dir_sep() */ #include <sys/types.h> /* opendir */ +#ifdef HAVE_DIRENT_H #include <dirent.h> +#endif #if defined(_MSC_VER) && _MSC_VER >= 1400 #define open _open diff -r fa797514e587 -r 886d87916d39 MonetDB5/src/mal/mal_sabaoth.mx --- a/MonetDB5/src/mal/mal_sabaoth.mx Thu Nov 25 14:25:57 2010 +0100 +++ b/MonetDB5/src/mal/mal_sabaoth.mx Thu Nov 25 15:36:31 2010 +0100 @@ -45,7 +45,9 @@ #include <stdio.h> /* fseek, rewind */ #include <unistd.h> /* unlink and friends */ #include <sys/types.h> +#ifdef HAVE_DIRENT_H #include <dirent.h> /* readdir, DIR */ +#endif #include <sys/stat.h> #include <errno.h> #include <string.h> /* for getting error messages */ diff -r fa797514e587 -r 886d87916d39 MonetDB5/src/modules/mal/mdb.mx --- a/MonetDB5/src/modules/mal/mdb.mx Thu Nov 25 14:25:57 2010 +0100 +++ b/MonetDB5/src/modules/mal/mdb.mx Thu Nov 25 15:36:31 2010 +0100 @@ -217,7 +217,9 @@ #include <stdarg.h> #include <time.h> #include <sys/types.h> +#ifdef HAVE_DIRENT_H #include <dirent.h> +#endif #include "mal_resolve.h" #include "mal_linker.h" #include "mal_client.h" diff -r fa797514e587 -r 886d87916d39 MonetDB5/src/modules/mal/replication.mx --- a/MonetDB5/src/modules/mal/replication.mx Thu Nov 25 14:25:57 2010 +0100 +++ b/MonetDB5/src/modules/mal/replication.mx Thu Nov 25 15:36:31 2010 +0100 @@ -380,7 +380,9 @@ #include "mal_config.h" #include "replication.h" #include <sys/types.h> +#ifdef HAVE_DIRENT_H #include <dirent.h> +#endif #include "sabaoth.h" #include "mal_client.h" #include "algebra.h" diff -r fa797514e587 -r 886d87916d39 buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Thu Nov 25 14:25:57 2010 +0100 +++ b/buildtools/conf/winrules.msc Thu Nov 25 15:36:31 2010 +0100 @@ -101,8 +101,11 @@ !IFNDEF LIBPCRE LIBPCRE = C:\Program Files\PCRE !ENDIF -PCRE_LIBS = "$(LIBPCRE)\lib\pcre$(DEBUGLIB).lib" -PCRE_CFLAGS = -DHAVE_LIBPCRE "-I$(LIBPCRE)\include" +pcre_LIBS = "$(LIBPCRE)\lib\pcre$(DEBUGLIB).lib" +pcre_CFLAGS = -DHAVE_LIBPCRE "-I$(LIBPCRE)\include" +# backward compatibility: +PCRE_LIBS = $(pcre_LIBS) +PCRE_CFLAGS = $(pcre_CFLAGS) !ENDIF !IFDEF HAVE_OPENSSL @@ -110,8 +113,11 @@ !IFNDEF LIBOPENSSL LIBOPENSSL = C:\openssl-0.9.8k.win$(bits) !ENDIF -OPENSSL_LIBS = "$(LIBOPENSSL)\lib\ssleay32.lib" "$(LIBOPENSSL)\lib\libeay32.lib" -OPENSSL_INCS = -DHAVE_OPENSSL "-I$(LIBOPENSSL)\include" +openssl_LIBS = "$(LIBOPENSSL)\lib\ssleay32.lib" "$(LIBOPENSSL)\lib\libeay32.lib" +openssl_CFLAGS = -DHAVE_OPENSSL "-I$(LIBOPENSSL)\include" +# backward compatibility: +OPENSSL_LIBS = $(openssl_LIBS) +OPENSSL_INCS = $(openssl_CFLAGS) !ENDIF !IFDEF HAVE_ICONV _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
