Browse Source

Fix building issues on MingW

pull/1097/head
Max Lv 7 years ago
parent
commit
4fd36ecf03
3 changed files with 12 additions and 9 deletions
  1. 18
      configure.ac
  2. 2
      libcork
  3. 1
      src/plugin.c

18
configure.ac

@ -299,23 +299,25 @@ AC_CHECK_LIB(socket, connect)
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS([malloc memset socket]) 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 Add define for libudns to enable IPv6 support
dnl This is an option defined in the origin configure script dnl This is an option defined in the origin configure script
AC_DEFINE([HAVE_IPv6], [1], [Enable IPv6 support in libudns]) 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([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@:>@.])]) AC_CHECK_LIB([ev], [ev_loop_destroy], ,[AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])])
AM_COND_IF([ENABLE_DOCUMENTATION], AM_COND_IF([ENABLE_DOCUMENTATION],
[AC_CONFIG_FILES([doc/Makefile]) [AC_CONFIG_FILES([doc/Makefile])
]) ])
AC_CONFIG_FILES([shadowsocks-libev.pc
Makefile
libcork/Makefile
libipset/Makefile
src/Makefile])
AC_OUTPUT AC_OUTPUT

2
libcork

@ -1 +1 @@
Subproject commit 5c818837130e095f8bbd2bc0ccfbd411411ba78a
Subproject commit 892a8846dcbed4ef068d8e3b642f1132eb08c85c

1
src/plugin.c

@ -201,6 +201,7 @@ int is_plugin_running()
int int
start_plugin(const char *plugin, start_plugin(const char *plugin,
const char *plugin_opts,
const char *remote_host, const char *remote_host,
const char *remote_port, const char *remote_port,
const char *local_host, const char *local_host,

Loading…
Cancel
Save