From 4fd36ecf03c02e8faf6f0acb3a5ca81769fcebb0 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 19 Jan 2017 09:39:32 +0800
Subject: [PATCH] Fix building issues on MingW

---
 configure.ac | 18 ++++++++++--------
 libcork      |  2 +-
 src/plugin.c |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 959c0d4c..711ad618 100755
--- a/configure.ac
+++ b/configure.ac
@@ -299,23 +299,25 @@ AC_CHECK_LIB(socket, connect)
 dnl Checks for library functions.
 AC_CHECK_FUNCS([malloc memset socket])
 
+AC_CHECK_LIB([sodium], [sodium_init], ,
+     [ AC_MSG_ERROR([Couldn't find libsodium. Try installing libsodium-dev@<:@el@:>@.])])
+
 dnl Add define for libudns to enable IPv6 support
 dnl This is an option defined in the origin configure script
 AC_DEFINE([HAVE_IPv6], [1], [Enable IPv6 support in libudns])
 
-AC_CHECK_LIB([sodium], [sodium_init], ,
-     [ AC_MSG_ERROR([Couldn't find libsodium. Try installing libsodium-dev@<:@el@:>@.])])
-
-AC_CONFIG_FILES([shadowsocks-libev.pc
-                 Makefile
-                 libcork/Makefile
-                 libipset/Makefile
-                 src/Makefile])
 AC_CHECK_LIB([udns], [dns_dnlen], ,[AC_MSG_ERROR([Couldn't find libudns. Try installing libudns-dev or udns-devel.])])
+
 AC_CHECK_LIB([ev], [ev_loop_destroy], ,[AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])])
 
 AM_COND_IF([ENABLE_DOCUMENTATION],
   [AC_CONFIG_FILES([doc/Makefile])
 ])
 
+AC_CONFIG_FILES([shadowsocks-libev.pc
+                 Makefile
+                 libcork/Makefile
+                 libipset/Makefile
+                 src/Makefile])
+
 AC_OUTPUT
diff --git a/libcork b/libcork
index 5c818837..892a8846 160000
--- a/libcork
+++ b/libcork
@@ -1 +1 @@
-Subproject commit 5c818837130e095f8bbd2bc0ccfbd411411ba78a
+Subproject commit 892a8846dcbed4ef068d8e3b642f1132eb08c85c
diff --git a/src/plugin.c b/src/plugin.c
index e929e605..df71cade 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -201,6 +201,7 @@ int is_plugin_running()
 
 int
 start_plugin(const char *plugin,
+             const char *plugin_opts,
              const char *remote_host,
              const char *remote_port,
              const char *local_host,