mtr v0.60

 - John Thacker submitted a surprisingly simple patch to enable
   linking against GTK2.  (up to 2.4.0)

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

diff --git a/AUTHORS b/AUTHORS
index 6dedd6a2c402b03547a7daa9b4a6d03614e03825..629f1ed1b4664de0168b187592fe3762bf4bc847 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,8 +14,9 @@
    the end... )
 
         Bohdan Vlasyuk (bohdan@cec.vstu.vinnica.ua)
+        Evgeniy Tretyak (evtr@ukr.net)
+        John Thacker (thacker@math.cornell.edu)
         Juha Takala
-        evtr@ukr.net (Evgeniy Tretyak)
         David Sward (sward@clark.net)
         David Stone (stone@AsIf.com)
         Andrew Stesin

diff --git a/NEWS b/NEWS
index 9c9a3b4d8abefc0065720374bdfabee9aa9cc7ec..99485fc037f6aee4c927f01986e36d370f740964 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 WHAT'S NEW?
+  v0.60 John Thacker submitted a surprisingly simple patch to
+        enable linking against GTK2.  (up to 2.4.0)
+
   v0.59 Josh Martin suggested to add some bounds checking to 
         the dynamic field code. This caused me to delve in, and
         rewrite some things. Now 50 lines of code less, but cleaner

diff --git a/configure.in b/configure.in
index f536dabf48af07a1384e949099f5d46034d87020..44a92ad44d0d6d82fc661980b31e1151b9254ccf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.59)
+AM_INIT_AUTOMAKE(mtr, 0.60)
 
 
 AC_SUBST(GTK_OBJ)
@@ -45,12 +45,24 @@ AC_ARG_WITH(gtk,
 [  --without-gtk           Do not try to use GTK+ at all],
 WANTS_GTK=$withval, WANTS_GTK=yes)
 
+AC_ARG_ENABLE(gtk2,
+[  --enable-gtk2           Compile against GTK2 instead of GTK+],
+WANTS_GTK2=$enableval, WANTS_GTK2=no)
+   
 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="")
+       if test "x$WANTS_GTK2" = "xyes"; then
+                AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
+                           LIBS="$LIBS $GTK_LIBS",
+                           AC_MSG_WARN(Building without GTK2 display support)
+                           AC_DEFINE(NO_GTK)
+                           GTK_OBJ="")
+        else
+               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="")
+       fi
 else
        AC_DEFINE(NO_GTK)
        GTK_OBJ=""