Changeset 30106


Ignore:
Timestamp:
2012-02-04T21:09:16+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] mtr: merge r28398, r29737

Location:
branches/packages_10.03.2/net/mtr
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/mtr/Makefile

    r26188 r30106  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=mtr 
    11 PKG_VERSION:=0.80 
     11PKG_VERSION:=0.82 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr 
    16 PKG_MD5SUM:=fa68528eaec1757f52bacf9fea8c68a9 
     16PKG_MD5SUM:=10601ea543fda3e51545c4bce195b64c 
    1717 
    1818PKG_INSTALL:=1 
  • branches/packages_10.03.2/net/mtr/patches/520-libresolv_fix.patch

    r26188 r30106  
    99-   AC_CHECK_LIB(resolv, res_mkquery, , 
    1010-     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found))))) 
    11 +#AC_CHECK_FUNC(res_mkquery, ,  
    12 +#  AC_CHECK_LIB(bind, res_mkquery, ,  
     11+#AC_CHECK_FUNC(res_mkquery, , 
     12+#  AC_CHECK_LIB(bind, res_mkquery, , 
    1313+#   AC_CHECK_LIB(resolv, res_mkquery, , 
    1414+#     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found))))) 
  • branches/packages_10.03.2/net/mtr/patches/521-gtk_fix.patch

    r26188 r30106  
    1212-                           GTK_OBJ="") 
    1313-else 
    14 -       AC_DEFINE(NO_GTK) 
    15 -       GTK_OBJ="" 
    16 -fi 
    1714+#if test "x$WANTS_GTK" = "xyes"; then 
    1815+#        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS" 
     
    2219+#                           GTK_OBJ="") 
    2320+#else 
    24 +       AC_DEFINE(NO_GTK) 
    25 +       GTK_OBJ="" 
     21        AC_DEFINE(NO_GTK) 
     22        GTK_OBJ="" 
     23-fi 
    2624+#fi 
    2725  
Note: See TracChangeset for help on using the changeset viewer.