From 25174daa9606e5d0905f1b4b5aad3b7b5a76b43d Mon Sep 17 00:00:00 2001 From: Roger Wolff Date: Sun, 15 Apr 2001 00:00:00 +0000 Subject: [PATCH] mtr v0.43 - Compile fixes. source: ftp://ftp.bitwizard.nl/mtr/mtr-0.43.tar.gz --- ChangeLog | 11 +++++++++++ README | 12 ++++++++++-- configure.in | 32 +++++++++++++++++++++----------- dns.c | 1 + mtr.c | 2 +- select.c | 1 + 6 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..b19c0af --- /dev/null +++ b/ChangeLog @@ -0,0 +1,11 @@ +2001-04-15 root + + * Added this file so that automake won't complain. + * Commented out the test for res_init in configure.in; + it does not work for GLIBC2 systems (e.g., RedHat 7+). + * Fixed the subordinate CHECK_LIBS on the test for res_mkquery, + so that they test for res_mkquery, not res_init. + + + + diff --git a/README b/README index bc428fc..385cd2e 100644 --- a/README +++ b/README @@ -53,6 +53,12 @@ INSTALLING in a setuid program, then there is something to say for moving them to the "trusted" directory.) + On Solaris, linking usually fails to find "wattr" or something like that. + Somehow, I can't seem to be able to automate "configure" finding the right + libs on Solaris. So, the solution is that you cut-and-paste the line + doing the linking into a terminal window, and add "-lcurses" by hand. + Then it will link. Help on how to catch this in autoconf appreciated. + WHERE CAN I GET THE LATEST VERSION OR MORE INFORMATION? @@ -65,5 +71,7 @@ WHERE CAN I GET THE LATEST VERSION OR MORE INFORMATION? the message. To send a message to the mailing list, mail to 'mtr@lists.xmission.com'. - Bug reports and feature requests should be sent to the mtr - mailing list. + Bug reports and feature requests should be submitted into the + jitterbug bug-tracking system at http://www.BitWizard.nl/cgi-bin/mtr . + If you don't have web-access, mail the mailinglist. + diff --git a/configure.in b/configure.in index d6b9d5e..78d9011 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(mtr.c) -AM_INIT_AUTOMAKE(mtr, 0.42) +AM_INIT_AUTOMAKE(mtr, 0.43) AC_SUBST(GTK_OBJ) AC_SUBST(CURSES_OBJ) @@ -39,11 +39,21 @@ AC_CHECK_HEADERS(sys/xti.h) AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) -AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS", - AC_MSG_WARN(Building without GTK+ display support) - AC_DEFINE(NO_GTK) - GTK_OBJ=) +dnl Added ability to cleanly disable GTK+ (12 Jan 2000, Joseph Carter) +AC_ARG_WITH(gtk, +[ --without-gtk Do not try to use GTK+ at all], +WANTS_GTK=$withval, WANTS_GTK=yes) + +if test "x$WANTS_GTK" = "xyes"; then + AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS", + AC_MSG_WARN(Building without GTK+ display support) + AC_DEFINE(NO_GTK) + GTK_OBJ="") +else + AC_DEFINE(NO_GTK) + GTK_OBJ="" +fi AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) @@ -51,16 +61,16 @@ AC_CHECK_FUNC(socket, , AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, , AC_MSG_ERROR(No nameservice library found))) -AC_CHECK_FUNC(res_init, , - AC_CHECK_LIB(bind, res_init, , - AC_CHECK_LIB(resolv, res_init, , AC_MSG_ERROR(No resolver library found)))) +#AC_CHECK_FUNC(res_init, , +# AC_CHECK_LIB(bind, res_init, , +# AC_CHECK_LIB(resolv, res_init, , AC_MSG_ERROR(No resolver library found)))) AC_CHECK_FUNCS(seteuid) # AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid)) AC_CHECK_FUNC(res_mkquery, , - AC_CHECK_LIB(bind, res_init, , - AC_CHECK_LIB(resolv, res_init, , AC_MSG_ERROR(No resolver library found)))) + AC_CHECK_LIB(bind, res_mkquery, , + AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found)))) AC_CHECK_FUNC(herror, , AC_DEFINE(NO_HERROR)) AC_CHECK_FUNC(strerror, , AC_DEFINE(NO_STRERROR)) diff --git a/dns.c b/dns.c index 87d3c1f..5eec339 100644 --- a/dns.c +++ b/dns.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/mtr.c b/mtr.c index 7af7ef8..8ad4f0e 100644 --- a/mtr.c +++ b/mtr.c @@ -67,7 +67,7 @@ void parse_arg(int argc, char **argv) { opt = 0; while(1) { - opt = getopt_long(argc, argv, "hvrc:tklnsi:p:", long_options, NULL); + opt = getopt_long(argc, argv, "hvrc:tgklnsi:p:", long_options, NULL); if(opt == -1) break; diff --git a/select.c b/select.c index 6517cfa..797372b 100644 --- a/select.c +++ b/select.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include -- 2.47.3