mtr v0.43

 - Compile fixes.

source: ftp://ftp.bitwizard.nl/mtr/mtr-0.43.tar.gz

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..b19c0af
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,11 @@
+2001-04-15  root  <alane@geeksrus.net>
+
+       * 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 bc428fc6701d58bd93ce772f2793aa0c18ded79e..385cd2e38c496360ceb25abd89ad6476f7dbb437 100644 (file)
--- 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 d6b9d5e7e75177251092dd96003601fa7413c7b2..78d901149f5b68e422fb9a68f828ca13e76bf7d9 100644 (file)
--- 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 87d3c1f347ead4dc07bbdd8d1cbc2d80cf4b5157..5eec33944c02a8cf5eef790edca53bc47aa555a7 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
 #include <sys/socket.h>

diff --git a/mtr.c b/mtr.c
index 7af7ef8ef745d015e2bf8add26309218242b9d26..8ad4f0e6d84303863f9f38069376b2404eda5292 100644 (file)
--- 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 6517cfa79bd8fde2fc64e66dd6298b1bf01e9de5..797372b6da4a9c87c567a314ee05a3bab06faf29 100644 (file)
--- a/select.c
+++ b/select.c
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
+#include <sys/select.h>
 #include <string.h>
 #include <math.h>