From 5301ccfaad901e8419b436864ed643d7a661daaa Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 15 Jun 2013 00:57:08 +0000 Subject: [PATCH] bump version --- Makefile.in | 13 ++- aclocal.m4 | 3 +- config.h.in | 15 +-- configure | 214 ++++++++++------------------------------- configure.ac | 2 +- libasyncns/Makefile.in | 13 ++- libev/Makefile.in | 13 ++- src/Makefile.in | 23 ++--- 8 files changed, 87 insertions(+), 209 deletions(-) diff --git a/Makefile.in b/Makefile.in index 331bb4ad..5c723de5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,11 +40,11 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/inet_aton.m4 $(top_srcdir)/m4/inet_ntoa.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/libev/libev.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -155,8 +155,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -INET_ATON_LIB = @INET_ATON_LIB@ -INET_NTOA_LIB = @INET_NTOA_LIB@ +INET_NTOP_LIB = @INET_NTOP_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/aclocal.m4 b/aclocal.m4 index 792cbd16..46458e58 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -950,8 +950,7 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/acx_pthread.m4]) -m4_include([m4/inet_aton.m4]) -m4_include([m4/inet_ntoa.m4]) +m4_include([m4/inet_ntop.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff --git a/config.h.in b/config.h.in index c6812d9a..c3423015 100644 --- a/config.h.in +++ b/config.h.in @@ -12,13 +12,9 @@ /* Define to 1 to use the syscall interface for clock_gettime */ #undef HAVE_CLOCK_SYSCALL -/* Define to 1 if you have the declaration of `inet_aton', and to 0 if you +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you don't. */ -#undef HAVE_DECL_INET_ATON - -/* Define to 1 if you have the declaration of `inet_ntoa', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_NTOA +#undef HAVE_DECL_INET_NTOP /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -41,11 +37,8 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntoa' function. */ -#undef HAVE_INET_NTOA +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP /* Define to 1 if you have the `inotify_init' function. */ #undef HAVE_INOTIFY_INIT diff --git a/configure b/configure index 0ac83817..637c62f3 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for shadowsocks 1.3.2. +# Generated by GNU Autoconf 2.67 for shadowsocks 1.3.3. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks' PACKAGE_TARNAME='shadowsocks' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='shadowsocks 1.3.2' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='shadowsocks 1.3.3' PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_URL='' @@ -754,8 +754,7 @@ acx_pthread_config LIBOBJS BUILD_REDIRECTOR_FALSE BUILD_REDIRECTOR_TRUE -INET_NTOA_LIB -INET_ATON_LIB +INET_NTOP_LIB CPP OTOOL64 OTOOL @@ -1428,7 +1427,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures shadowsocks 1.3.2 to adapt to many kinds of systems. +\`configure' configures shadowsocks 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1498,7 +1497,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadowsocks 1.3.2:";; + short | recursive ) echo "Configuration of shadowsocks 1.3.3:";; esac cat <<\_ACEOF @@ -1604,7 +1603,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadowsocks configure 1.3.2 +shadowsocks configure 1.3.3 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2126,7 +2125,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by shadowsocks $as_me 1.3.2, which was +It was created by shadowsocks $as_me 1.3.3, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2946,7 +2945,7 @@ fi # Define the identity of the package. PACKAGE='shadowsocks' - VERSION='1.3.2' + VERSION='1.3.3' cat >>confdefs.h <<_ACEOF @@ -4648,13 +4647,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4651: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4650: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4654: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4653: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4657: output\"" >&5) + (eval echo "\"\$as_me:4656: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5860,7 +5859,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5863 "configure"' > conftest.$ac_ext + echo '#line 5862 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7389,11 +7388,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7392: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7391: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7396: \$? = $ac_status" >&5 + echo "$as_me:7395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7728,11 +7727,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7731: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7735: \$? = $ac_status" >&5 + echo "$as_me:7734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7833,11 +7832,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7836: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7835: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7840: \$? = $ac_status" >&5 + echo "$as_me:7839: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7888,11 +7887,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7891: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7890: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7895: \$? = $ac_status" >&5 + echo "$as_me:7894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10272,7 +10271,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10275 "configure" +#line 10274 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10368,7 +10367,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10371 "configure" +#line 10370 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11149,12 +11148,12 @@ done - HAVE_INET_ATON=1 - INET_ATON_LIB= + HAVE_INET_NTOP=1 + INET_NTOP_LIB= ss_save_LIBS=$LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5 -$as_echo_n "checking for library containing inet_aton... " >&6; } -if test "${ac_cv_search_inet_aton+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 +$as_echo_n "checking for library containing inet_ntop... " >&6; } +if test "${ac_cv_search_inet_ntop+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -11167,11 +11166,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char inet_aton (); +char inet_ntop (); int main () { -return inet_aton (); +return inet_ntop (); ; return 0; } @@ -11184,179 +11183,72 @@ for ac_lib in '' nsl resolv; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_inet_aton=$ac_res + ac_cv_search_inet_ntop=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_inet_aton+set}" = set; then : + if test "${ac_cv_search_inet_ntop+set}" = set; then : break fi done -if test "${ac_cv_search_inet_aton+set}" = set; then : +if test "${ac_cv_search_inet_ntop+set}" = set; then : else - ac_cv_search_inet_aton=no + ac_cv_search_inet_ntop=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5 -$as_echo "$ac_cv_search_inet_aton" >&6; } -ac_res=$ac_cv_search_inet_aton +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 +$as_echo "$ac_cv_search_inet_ntop" >&6; } +ac_res=$ac_cv_search_inet_ntop if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - for ac_func in inet_aton + for ac_func in inet_ntop do : - ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" -if test "x$ac_cv_func_inet_aton" = x""yes; then : + ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +if test "x$ac_cv_func_inet_ntop" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_INET_ATON 1 +#define HAVE_INET_NTOP 1 _ACEOF fi done - if test $ac_cv_func_inet_aton = no; then - HAVE_INET_ATON=0 + if test $ac_cv_func_inet_ntop = no; then + HAVE_INET_NTOP=0 fi fi LIBS=$ss_save_LIBS - if test "$ac_cv_search_inet_aton" != "no" \ - && test "$ac_cv_search_inet_aton" != "none required"; then - INET_ATON_LIB="$ac_cv_search_inet_aton" + if test "$ac_cv_search_inet_ntop" != "no" \ + && test "$ac_cv_search_inet_ntop" != "none required"; then + INET_NTOP_LIB="$ac_cv_search_inet_ntop" fi - ac_fn_c_check_decl "$LINENO" "inet_aton" "ac_cv_have_decl_inet_aton" "#include + ac_fn_c_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" "#include #if HAVE_NETDB_H # include #endif " -if test "x$ac_cv_have_decl_inet_aton" = x""yes; then : +if test "x$ac_cv_have_decl_inet_ntop" = x""yes; then : ac_have_decl=1 else ac_have_decl=0 fi cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_INET_ATON $ac_have_decl +#define HAVE_DECL_INET_NTOP $ac_have_decl _ACEOF - if test $ac_cv_have_decl_inet_aton = no; then - HAVE_DECL_INET_ATON=0 - fi - - - - - - HAVE_INET_NTOA=1 - INET_NTOA_LIB= - ss_save_LIBS=$LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5 -$as_echo_n "checking for library containing inet_ntoa... " >&6; } -if test "${ac_cv_search_inet_ntoa+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$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 inet_ntoa (); -int -main () -{ -return inet_ntoa (); - ; - return 0; -} -_ACEOF -for ac_lib in '' nsl resolv; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_inet_ntoa=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_inet_ntoa+set}" = set; then : - break -fi -done -if test "${ac_cv_search_inet_ntoa+set}" = set; then : - -else - ac_cv_search_inet_ntoa=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5 -$as_echo "$ac_cv_search_inet_ntoa" >&6; } -ac_res=$ac_cv_search_inet_ntoa -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - for ac_func in inet_ntoa -do : - ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa" -if test "x$ac_cv_func_inet_ntoa" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INET_NTOA 1 -_ACEOF - -fi -done - - if test $ac_cv_func_inet_ntoa = no; then - HAVE_INET_NTOA=0 - fi - -fi - - LIBS=$ss_save_LIBS - - if test "$ac_cv_search_inet_ntoa" != "no" \ - && test "$ac_cv_search_inet_ntoa" != "none required"; then - INET_NTOA_LIB="$ac_cv_search_inet_ntoa" - fi - - - ac_fn_c_check_decl "$LINENO" "inet_ntoa" "ac_cv_have_decl_inet_ntoa" "#include - #if HAVE_NETDB_H - # include - #endif - -" -if test "x$ac_cv_have_decl_inet_ntoa" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_INET_NTOA $ac_have_decl -_ACEOF - - if test $ac_cv_have_decl_inet_ntoa = no; then - HAVE_DECL_INET_NTOA=0 + if test $ac_cv_have_decl_inet_ntop = no; then + HAVE_DECL_INET_NTOP=0 fi @@ -13616,7 +13508,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shadowsocks $as_me 1.3.2, which was +This file was extended by shadowsocks $as_me 1.3.3, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13682,7 +13574,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shadowsocks config.status 1.3.2 +shadowsocks config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3ebe1589..fbcc7757 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl -*- Autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([shadowsocks], [1.3.2], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks], [1.3.3], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/libasyncns/Makefile.in b/libasyncns/Makefile.in index b4d68f01..c3330d8a 100644 --- a/libasyncns/Makefile.in +++ b/libasyncns/Makefile.in @@ -56,11 +56,11 @@ subdir = libasyncns DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/inet_aton.m4 $(top_srcdir)/m4/inet_ntoa.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/libev/libev.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -117,8 +117,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -INET_ATON_LIB = @INET_ATON_LIB@ -INET_NTOA_LIB = @INET_NTOA_LIB@ +INET_NTOP_LIB = @INET_NTOP_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/libev/Makefile.in b/libev/Makefile.in index f39118a1..1d5cfc28 100644 --- a/libev/Makefile.in +++ b/libev/Makefile.in @@ -40,11 +40,11 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/inet_aton.m4 $(top_srcdir)/m4/inet_ntoa.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/libev/libev.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -100,8 +100,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -INET_ATON_LIB = @INET_ATON_LIB@ -INET_NTOA_LIB = @INET_NTOA_LIB@ +INET_NTOP_LIB = @INET_NTOP_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/Makefile.in b/src/Makefile.in index 91401afb..89e5c435 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,11 +40,11 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/inet_aton.m4 $(top_srcdir)/m4/inet_ntoa.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/openssl.m4 \ - $(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/libev/libev.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -57,20 +57,18 @@ PROGRAMS = $(bin_PROGRAMS) am_ss_local_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \ encrypt.$(OBJEXT) local.$(OBJEXT) ss_local_OBJECTS = $(am_ss_local_OBJECTS) -am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(top_builddir)/libev/libev.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -ss_local_DEPENDENCIES = $(am__DEPENDENCIES_2) +am__DEPENDENCIES_1 = $(top_builddir)/libev/libev.la +ss_local_DEPENDENCIES = $(am__DEPENDENCIES_1) am__ss_redir_SOURCES_DIST = utils.c jconf.c json.c encrypt.c redir.c @BUILD_REDIRECTOR_TRUE@am_ss_redir_OBJECTS = utils.$(OBJEXT) \ @BUILD_REDIRECTOR_TRUE@ jconf.$(OBJEXT) json.$(OBJEXT) \ @BUILD_REDIRECTOR_TRUE@ encrypt.$(OBJEXT) redir.$(OBJEXT) ss_redir_OBJECTS = $(am_ss_redir_OBJECTS) -@BUILD_REDIRECTOR_TRUE@ss_redir_DEPENDENCIES = $(am__DEPENDENCIES_2) +@BUILD_REDIRECTOR_TRUE@ss_redir_DEPENDENCIES = $(am__DEPENDENCIES_1) am_ss_server_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \ encrypt.$(OBJEXT) server.$(OBJEXT) ss_server_OBJECTS = $(am_ss_server_OBJECTS) -ss_server_DEPENDENCIES = $(am__DEPENDENCIES_2) \ +ss_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(top_builddir)/libasyncns/libasyncns.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -115,8 +113,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ -INET_ATON_LIB = @INET_ATON_LIB@ -INET_NTOA_LIB = @INET_NTOA_LIB@ +INET_NTOP_LIB = @INET_NTOP_LIB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@