net/mtr: remove libresolv dependency

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26188 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 41fb068..3e7c8c0 100644 (file)
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=fa68528eaec1757f52bacf9fea8c68a9
 
 PKG_INSTALL:=1
 
+PKG_FIXUP:=autoreconf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mtr
@@ -41,8 +43,8 @@ endef
 CONFIGURE_ARGS += \
        --without-gtk \
 
-CONFIGURE_VARS += \
-       ac_cv_lib_resolv_res_mkquery=yes \
+#CONFIGURE_VARS += \
+#      ac_cv_lib_resolv_res_mkquery=no \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); touch \

diff --git a/net/mtr/patches/520-libresolv_fix.patch b/net/mtr/patches/520-libresolv_fix.patch
new file mode 100644 (file)
index 0000000..e507553
--- /dev/null
+++ b/net/mtr/patches/520-libresolv_fix.patch
@@ -0,0 +1,17 @@
+--- a/configure.in
++++ b/configure.in
+@@ -72,10 +72,10 @@ AC_CHECK_FUNC(gethostbyname, ,
+ 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_mkquery, , 
+-   AC_CHECK_LIB(resolv, res_mkquery, ,
+-     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
++#AC_CHECK_FUNC(res_mkquery, , 
++#  AC_CHECK_LIB(bind, res_mkquery, , 
++#   AC_CHECK_LIB(resolv, res_mkquery, ,
++#     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
+ # This next line would override the just detected-or-not -lresolv. 
+ # This apparently hurts BSD. And it's bad practise. So it should go. 
+ # However, it probably didn't get added for nothing..... Holler if

diff --git a/net/mtr/patches/521-gtk_fix.patch b/net/mtr/patches/521-gtk_fix.patch
new file mode 100644 (file)
index 0000000..5dbcbed
--- /dev/null
+++ b/net/mtr/patches/521-gtk_fix.patch
@@ -0,0 +1,29 @@
+--- a/configure.in
++++ b/configure.in
+@@ -48,16 +48,16 @@ AC_ARG_ENABLE(ipv6,
+ [  --disable-ipv6          Do not enable IPv6],
+ WANTS_IPV6=$enableval, WANTS_IPV6=yes)
+    
+-if test "x$WANTS_GTK" = "xyes"; then
+-        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
+-                           LIBS="$LIBS $GTK_LIBS -lm",
+-                           AC_MSG_WARN(Building without GTK2 display support)
+-                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
+-                           GTK_OBJ="")
+-else
+-      AC_DEFINE(NO_GTK)
+-      GTK_OBJ=""
+-fi
++#if test "x$WANTS_GTK" = "xyes"; then
++#        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
++#                           LIBS="$LIBS $GTK_LIBS -lm",
++#                           AC_MSG_WARN(Building without GTK2 display support)
++#                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
++#                           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)))