Only in mtr-0.71: .deps diff -ur mtr-0.70/autom4te.cache/output.0 mtr-0.71/autom4te.cache/output.0 --- mtr-0.70/autom4te.cache/output.0 2006-03-23 13:59:49.000000000 +0100 +++ mtr-0.71/autom4te.cache/output.0 2006-03-24 07:46:43.000000000 +0100 @@ -1499,7 +1499,7 @@ PACKAGE=mtr -VERSION=0.70 +VERSION=0.71 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -6882,6 +6882,78 @@ LIBS="-lresolv $LIBS" else + +echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5 +echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv___res_mkquery+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __res_mkquery (); +int +main () +{ +__res_mkquery (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv___res_mkquery=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_resolv___res_mkquery=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_mkquery" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv___res_mkquery" >&6 +if test $ac_cv_lib_resolv___res_mkquery = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" + +else { { echo "$as_me:$LINENO: error: No resolver library found" >&5 echo "$as_me: error: No resolver library found" >&2;} { (exit 1); exit 1; }; } @@ -6891,6 +6963,9 @@ fi +fi + +LIBS="$LIBS -lresolv" echo "$as_me:$LINENO: checking for herror" >&5 echo $ECHO_N "checking for herror... $ECHO_C" >&6 diff -ur mtr-0.70/autom4te.cache/requests mtr-0.71/autom4te.cache/requests --- mtr-0.70/autom4te.cache/requests 2006-03-23 13:59:49.000000000 +0100 +++ mtr-0.71/autom4te.cache/requests 2006-03-24 07:46:43.000000000 +0100 @@ -1,4 +1,4 @@ -# This file was generated by Autom4te Sun Mar 19 11:31:00 PST 2006. +# This file was generated by Autom4te Sat Jan 8 16:59:54 PST 2005. # It contains the lists of macros which have been traced. # It can be safely removed. @@ -55,8 +55,8 @@ 'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_FORK' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_VPRINTF' => 1, 'AC_FUNC_STRCOLL' => 1, 'AC_PROG_YACC' => 1, @@ -92,8 +92,8 @@ 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETLOADAVG' => 1, diff -ur mtr-0.70/autom4te.cache/traces.0 mtr-0.71/autom4te.cache/traces.0 --- mtr-0.70/autom4te.cache/traces.0 2006-03-23 13:59:49.000000000 +0100 +++ mtr-0.71/autom4te.cache/traces.0 2006-03-24 07:46:43.000000000 +0100 @@ -51,7 +51,7 @@ m4trace:configure.in:1: -1- AC_SUBST([ECHO_N]) m4trace:configure.in:1: -1- AC_SUBST([ECHO_T]) m4trace:configure.in:1: -1- AC_SUBST([LIBS]) -m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([mtr], [0.70]) +m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([mtr], [0.71]) m4trace:configure.in:2: -1- AM_AUTOMAKE_VERSION([1.4-p6]) m4trace:configure.in:2: -1- AC_PROG_INSTALL m4trace:configure.in:2: -1- AC_SUBST([INSTALL_PROGRAM]) @@ -449,13 +449,93 @@ m4trace:configure.in:85: -1- AC_CHECK_FUNCS([seteuid]) m4trace:configure.in:85: -1- AH_OUTPUT([HAVE_SETEUID], [/* Define to 1 if you have the `seteuid\' function. */ #undef HAVE_SETEUID]) -m4trace:configure.in:90: -3- AC_CHECK_LIB([resolv], [res_mkquery], [], [{ { echo "$as_me:$LINENO: error: No resolver library found" >&5 +m4trace:configure.in:91: -4- AC_CHECK_LIB([resolv], [__res_mkquery], [], [{ { echo "$as_me:$LINENO: error: No resolver library found" >&5 echo "$as_me: error: No resolver library found" >&2;} { (exit 1); exit 1; }; }]) -m4trace:configure.in:90: -3- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */ +m4trace:configure.in:91: -4- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */ #undef HAVE_LIBRESOLV]) -m4trace:configure.in:90: -3- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV]) -m4trace:configure.in:90: -2- AC_CHECK_LIB([bind], [res_mkquery], [], [ +m4trace:configure.in:91: -4- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV]) +m4trace:configure.in:91: -3- AC_CHECK_LIB([resolv], [res_mkquery], [], [ +echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5 +echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv___res_mkquery+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __res_mkquery (); +int +main () +{ +__res_mkquery (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv___res_mkquery=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_resolv___res_mkquery=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_mkquery" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv___res_mkquery" >&6 +if test $ac_cv_lib_resolv___res_mkquery = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" + +else + { { echo "$as_me:$LINENO: error: No resolver library found" >&5 +echo "$as_me: error: No resolver library found" >&2;} + { (exit 1); exit 1; }; } +fi +]) +m4trace:configure.in:91: -3- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */ +#undef HAVE_LIBRESOLV]) +m4trace:configure.in:91: -3- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV]) +m4trace:configure.in:91: -2- AC_CHECK_LIB([bind], [res_mkquery], [], [ echo "$as_me:$LINENO: checking for res_mkquery in -lresolv" >&5 echo $ECHO_N "checking for res_mkquery in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_res_mkquery+set}" = set; then @@ -527,40 +607,114 @@ LIBS="-lresolv $LIBS" else + +echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5 +echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv___res_mkquery+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __res_mkquery (); +int +main () +{ +__res_mkquery (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv___res_mkquery=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_resolv___res_mkquery=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_mkquery" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv___res_mkquery" >&6 +if test $ac_cv_lib_resolv___res_mkquery = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" + +else { { echo "$as_me:$LINENO: error: No resolver library found" >&5 echo "$as_me: error: No resolver library found" >&2;} { (exit 1); exit 1; }; } fi + +fi ]) -m4trace:configure.in:90: -2- AH_OUTPUT([HAVE_LIBBIND], [/* Define to 1 if you have the `bind\' library (-lbind). */ +m4trace:configure.in:91: -2- AH_OUTPUT([HAVE_LIBBIND], [/* Define to 1 if you have the `bind\' library (-lbind). */ #undef HAVE_LIBBIND]) -m4trace:configure.in:90: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBBIND]) -m4trace:configure.in:92: -2- AC_DEFINE_TRACE_LITERAL([NO_HERROR]) -m4trace:configure.in:93: -2- AC_DEFINE_TRACE_LITERAL([NO_STRERROR]) -m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_IPV6]) -m4trace:configure.in:98: -1- AH_OUTPUT([ENABLE_IPV6], [/* Define to enable IPv6 */ +m4trace:configure.in:91: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBBIND]) +m4trace:configure.in:94: -2- AC_DEFINE_TRACE_LITERAL([NO_HERROR]) +m4trace:configure.in:95: -2- AC_DEFINE_TRACE_LITERAL([NO_STRERROR]) +m4trace:configure.in:100: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_IPV6]) +m4trace:configure.in:100: -1- AH_OUTPUT([ENABLE_IPV6], [/* Define to enable IPv6 */ #undef ENABLE_IPV6]) -m4trace:configure.in:103: -1- _m4_warn([obsolete], [The macro `ac_cv_prog_gcc' is obsolete. +m4trace:configure.in:105: -1- _m4_warn([obsolete], [The macro `ac_cv_prog_gcc' is obsolete. You should run autoupdate.], [autoconf/c.m4:440: ac_cv_prog_gcc is expanded from... -configure.in:103: the top level]) -m4trace:configure.in:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +configure.in:105: the top level]) +m4trace:configure.in:115: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -configure.in:113: the top level]) -m4trace:configure.in:121: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +configure.in:115: the top level]) +m4trace:configure.in:123: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... -configure.in:121: the top level]) -m4trace:configure.in:142: -1- AC_CONFIG_HEADERS([config.h]) -m4trace:configure.in:142: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. +configure.in:123: the top level]) +m4trace:configure.in:144: -1- AC_CONFIG_HEADERS([config.h]) +m4trace:configure.in:144: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... aclocal.m4:1367: AM_CONFIG_HEADER is expanded from... -configure.in:142: the top level]) -m4trace:configure.in:142: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. +configure.in:144: the top level]) +m4trace:configure.in:144: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from... autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... aclocal.m4:1367: AM_CONFIG_HEADER is expanded from... -configure.in:142: the top level]) -m4trace:configure.in:143: -1- AC_CONFIG_FILES([Makefile img/Makefile]) -m4trace:configure.in:143: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +configure.in:144: the top level]) +m4trace:configure.in:145: -1- AC_CONFIG_FILES([Makefile img/Makefile]) +m4trace:configure.in:145: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.in:143: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.in:143: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.in:145: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.in:145: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) Only in mtr-0.71: config.log diff -ur mtr-0.70/configure mtr-0.71/configure --- mtr-0.70/configure 2006-03-23 07:01:15.000000000 +0100 +++ mtr-0.71/configure 2006-03-24 07:46:43.000000000 +0100 @@ -1499,7 +1499,7 @@ PACKAGE=mtr -VERSION=0.70 +VERSION=0.71 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -6882,6 +6882,78 @@ LIBS="-lresolv $LIBS" else + +echo "$as_me:$LINENO: checking for __res_mkquery in -lresolv" >&5 +echo $ECHO_N "checking for __res_mkquery in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv___res_mkquery+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __res_mkquery (); +int +main () +{ +__res_mkquery (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv___res_mkquery=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_resolv___res_mkquery=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_mkquery" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv___res_mkquery" >&6 +if test $ac_cv_lib_resolv___res_mkquery = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" + +else { { echo "$as_me:$LINENO: error: No resolver library found" >&5 echo "$as_me: error: No resolver library found" >&2;} { (exit 1); exit 1; }; } @@ -6891,6 +6963,9 @@ fi +fi + +LIBS="$LIBS -lresolv" echo "$as_me:$LINENO: checking for herror" >&5 echo $ECHO_N "checking for herror... $ECHO_C" >&6 diff -ur mtr-0.70/configure.in mtr-0.71/configure.in --- mtr-0.70/configure.in 2006-03-23 06:42:45.000000000 +0100 +++ mtr-0.71/configure.in 2006-03-24 07:37:17.000000000 +0100 @@ -1,5 +1,5 @@ AC_INIT(mtr.c) -AM_INIT_AUTOMAKE(mtr, 0.70) +AM_INIT_AUTOMAKE(mtr, 0.71) AC_SUBST(GTK_OBJ) @@ -87,7 +87,9 @@ AC_CHECK_FUNC(res_mkquery, , AC_CHECK_LIB(bind, res_mkquery, , - AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found)))) + AC_CHECK_LIB(resolv, res_mkquery, , + AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found))))) +LIBS="$LIBS -lresolv" AC_CHECK_FUNC(herror, , AC_DEFINE(NO_HERROR)) AC_CHECK_FUNC(strerror, , AC_DEFINE(NO_STRERROR)) diff -ur mtr-0.70/mtr.8 mtr-0.71/mtr.8 --- mtr-0.70/mtr.8 2005-01-11 09:10:13.000000000 +0100 +++ mtr-0.71/mtr.8 2006-03-24 07:37:17.000000000 +0100 @@ -8,7 +8,7 @@ .SH SYNOPSIS .B mtr [\c -.B \-hvrctglsni46\c +.B \-hvrctglspni46\c ] [\c .B \-\-help\c @@ -44,7 +44,7 @@ .B \-\-interval\ SECONDS\c ] [\c -.B \-\-psize\ BYTES | -p BYTES\c +.B \-\-psize\ BYTES | -s BYTES\c ] .B HOSTNAME [PACKETSIZE] @@ -124,7 +124,7 @@ those machines. Each cycle lasts one second. .TP -.B \-p\ BYTES +.B \-s\ BYTES .TP .B \-\-psize\ BYTES .TP @@ -167,7 +167,7 @@ for more information about GTK+. .TP -.B \-s +.B \-p .TP .B \-\-split .br diff -ur mtr-0.70/mtr.c mtr-0.71/mtr.c --- mtr-0.70/mtr.c 2006-03-23 06:58:47.000000000 +0100 +++ mtr-0.71/mtr.c 2006-03-24 07:37:17.000000000 +0100 @@ -368,10 +368,10 @@ } if (PrintHelp) { - printf("usage: %s [-hvrctglsni46] [--help] [--version] [--report]\n" + printf("usage: %s [-hvrctglspni46] [--help] [--version] [--report]\n" "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n" "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */ - "\t\t[--psize=bytes/-p=bytes]\n" /* ok */ + "\t\t[--psize=bytes/-s bytes]\n" /* ok */ "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]); exit(0); } diff -ur mtr-0.70/net.c mtr-0.71/net.c --- mtr-0.70/net.c 2006-03-23 06:45:58.000000000 +0100 +++ mtr-0.71/net.c 2006-03-24 07:37:17.000000000 +0100 @@ -334,6 +334,14 @@ int oldavg; /* usedByMin */ int oldjavg; /* usedByMin */ int i; /* usedByMin */ +#ifdef ENABLE_IPV6 + char addrcopy[sizeof(struct in6_addr)]; +#else + char addrcopy[sizeof(struct in_addr)]; +#endif + + /* Copy the from address ASAP because it can be overwritten */ + addrcpy( (void *) &addrcopy, addr, af ); if (seq < 0 || seq >= MaxSequence) return; @@ -351,22 +359,22 @@ if ( addrcmp( (void *) &(host[index].addr), (void *) &unspec_addr, af ) == 0 ) { // should be out of if as addr can change - addrcpy( (void *) &(host[index].addr), addr, af ); + addrcpy( (void *) &(host[index].addr), addrcopy, af ); display_rawhost(index, (void *) &(host[index].addr)); /* multi paths by Min */ - addrcpy( (void *) &(host[index].addrs[0]), addr, af ); + addrcpy( (void *) &(host[index].addrs[0]), addrcopy, af ); } else { for( i=0; i= 0) close(sendsock4); + if (recvsock4 >= 0) close(recvsock4); + if (sendsock6 >= 0) close(sendsock6); + if (recvsock6 >= 0) close(recvsock6); } .