Merge pull request #662 from bjori/windows-linker-fixes

Windows linker fixes

* bjori/windows-linker-fixes:
  We do need to link these too
  Include my own headers

Author: bjori

config.w32

@@ -7,13 +7,13 @@ ARG_WITH("mongo-sasl", "Mongo: Build against Cyrus-SASL", "no");
 
 if (PHP_MONGO != "no") {
   EXTENSION('mongo', 'php_mongo.c mongo.c mongoclient.c bson.c collection.c command_cursor.c cursor.c cursor_shared.c db.c io_stream.c log_stream.c');
-  ADD_SOURCES(configure_module_dirname + "/contrib", "php-json.c");
+  ADD_SOURCES(configure_module_dirname + "/contrib", "php-json.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/exceptions", "exception.c connection_exception.c cursor_exception.c cursor_timeout_exception.c execution_timeout_exception.c gridfs_exception.c duplicate_key_exception.c result_exception.c write_concern_exception.c protocol_exception.c ", "mongo");
   ADD_SOURCES(configure_module_dirname + "/gridfs", "gridfs.c gridfs_cursor.c gridfs_file.c gridfs_stream.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/types", "bin_data.c code.c date.c db_ref.c id.c int32.c int64.c regex.c timestamp.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/util", "log.c pool.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/mcon", "bson_helpers.c collection.c connections.c io.c manager.c mini_bson.c parse.c read_preference.c str.c utils.c", "mongo");
-  ADD_SOURCES(configure_module_dirname + "/mcon/contrib", "md5.c strndup.c");
+  ADD_SOURCES(configure_module_dirname + "/mcon/contrib", "md5.c strndup.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/api", "batch.c write.c wire_version.c", "mongo");
   ADD_SOURCES(configure_module_dirname + "/batch", "delete.c insert.c update.c write.c", "mongo");
 

mcon/contrib/md5.c

@@ -36,6 +36,7 @@
  */
 
 #include <string.h>
+#include "md5.h"
 
 /* Forward declaration for the MD5 algorithm */
 typedef unsigned int MD5_u32plus;

mcon/contrib/strndup.c

@@ -33,6 +33,7 @@
 #ifndef WIN32
 #include <unistd.h>
 #endif
+#include "strndup.h"
 
 /* Compat function for systems that do not have strndup().
  * This is borrowed from FreeBSD's strndup.c, with minor CS changes */