--- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ build/ .deps/ /Makefile src/Makefile +server/Makefile libev/Makefile libudns/Makefile libcork/Makefile --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ if USE_SYSTEM_SHARED_LIB -SUBDIRS = libcork libipset src +SUBDIRS = libcork libipset src server else -SUBDIRS = libsodium libcork libipset libudns libev src +SUBDIRS = libsodium libcork libipset libudns libev src server endif if ENABLE_DOCUMENTATION --- a/Makefile.in +++ b/Makefile.in @@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = libsodium libcork libipset libudns libev src doc +DIST_SUBDIRS = libsodium libcork libipset libudns libev src server doc am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/shadowsocks-libev.pc.in $(top_srcdir)/auto/ar-lib \ $(top_srcdir)/auto/compile $(top_srcdir)/auto/config.guess \ @@ -377,8 +377,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @USE_SYSTEM_SHARED_LIB_FALSE@SUBDIRS = libsodium libcork libipset \ -@USE_SYSTEM_SHARED_LIB_FALSE@ libudns libev src $(am__append_1) -@USE_SYSTEM_SHARED_LIB_TRUE@SUBDIRS = libcork libipset src \ +@USE_SYSTEM_SHARED_LIB_FALSE@ libudns libev src server \ +@USE_SYSTEM_SHARED_LIB_FALSE@ $(am__append_1) +@USE_SYSTEM_SHARED_LIB_TRUE@SUBDIRS = libcork libipset src server \ @USE_SYSTEM_SHARED_LIB_TRUE@ $(am__append_1) ACLOCAL_AMFLAGS = -I m4 pkgconfiglibdir = $(libdir)/pkgconfig --- a/configure +++ b/configure @@ -649,7 +649,6 @@ PTHREAD_CC ax_pthread_config INET_NTOP_LIB MV -RM GZIP XMLTO ASCIIDOC @@ -757,6 +756,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -857,6 +857,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1109,6 +1110,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1246,7 +1256,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1399,6 +1409,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2472,8 +2483,8 @@ ac_configure="$SHELL $ac_aux_dir/configu -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3783,7 +3794,7 @@ $as_echo "$ac_cv_safe_to_define___extens -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3972,7 +3983,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -4363,8 +4374,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -4549,6 +4560,7 @@ END as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" do @@ -12494,47 +12506,6 @@ $as_echo "no" >&6; } fi - # Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RM+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" - ;; -esac -fi -RM=$ac_cv_path_RM -if test -n "$RM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 -$as_echo "$RM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -16204,15 +16175,162 @@ $as_echo "#define HAVE_IPv6 1" >>confdef if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then : - else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sodium_init in -lsodium" >&5 +$as_echo_n "checking for sodium_init in -lsodium... " >&6; } +if ${ac_cv_lib_sodium_sodium_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsodium $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sodium_init (); +int +main () +{ +return sodium_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sodium_sodium_init=yes +else + ac_cv_lib_sodium_sodium_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sodium_sodium_init" >&5 +$as_echo "$ac_cv_lib_sodium_sodium_init" >&6; } +if test "x$ac_cv_lib_sodium_sodium_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSODIUM 1 +_ACEOF + + LIBS="-lsodium $LIBS" + +else + + as_fn_error $? "Couldn't find libsodium. Try installing libsodium-dev[el]." "$LINENO" 5 + +fi + + +else subdirs="$subdirs libsodium" fi -ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile src/Makefile" +ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile src/Makefile server/Makefile" if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then : - else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_dnlen in -ludns" >&5 +$as_echo_n "checking for dns_dnlen in -ludns... " >&6; } +if ${ac_cv_lib_udns_dns_dnlen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ludns $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dns_dnlen (); +int +main () +{ +return dns_dnlen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_udns_dns_dnlen=yes +else + ac_cv_lib_udns_dns_dnlen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udns_dns_dnlen" >&5 +$as_echo "$ac_cv_lib_udns_dns_dnlen" >&6; } +if test "x$ac_cv_lib_udns_dns_dnlen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUDNS 1 +_ACEOF + + LIBS="-ludns $LIBS" + +else + as_fn_error $? "Couldn't find libudns. Try installing libudns-dev or udns-devel." "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ev_loop_destroy in -lev" >&5 +$as_echo_n "checking for ev_loop_destroy in -lev... " >&6; } +if ${ac_cv_lib_ev_ev_loop_destroy+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lev $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ev_loop_destroy (); +int +main () +{ +return ev_loop_destroy (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ev_ev_loop_destroy=yes +else + ac_cv_lib_ev_ev_loop_destroy=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ev_ev_loop_destroy" >&5 +$as_echo "$ac_cv_lib_ev_ev_loop_destroy" >&6; } +if test "x$ac_cv_lib_ev_ev_loop_destroy" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBEV 1 +_ACEOF + + LIBS="-lev $LIBS" + +else + as_fn_error $? "Couldn't find libev. Try installing libev-dev[el]." "$LINENO" 5 +fi + + +else ac_config_files="$ac_config_files libudns/Makefile libev/Makefile" fi @@ -17258,6 +17376,7 @@ do "libcork/Makefile") CONFIG_FILES="$CONFIG_FILES libcork/Makefile" ;; "libipset/Makefile") CONFIG_FILES="$CONFIG_FILES libipset/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; "libudns/Makefile") CONFIG_FILES="$CONFIG_FILES libudns/Makefile" ;; "libev/Makefile") CONFIG_FILES="$CONFIG_FILES libev/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -17958,8 +18077,8 @@ $as_echo X"$file" | fi cfgfile="${ofile}T" - trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15 - $RM -f "$cfgfile" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL --- a/configure.ac +++ b/configure.ac @@ -315,7 +315,8 @@ AC_CONFIG_FILES([ shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile - src/Makefile]) + src/Makefile + server/Makefile]) AM_COND_IF([USE_SYSTEM_SHARED_LIB],[ 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@:>@.])])