[backfire] merge r26620§

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26621 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile
index 85f8fa10377f765cfdf109ad8a11648aca6d68ca..ab50a674682d35be29a81e2d2fc8809ad0f4e882 100644 (file)
--- a/tools/missing-macros/Makefile
+++ b/tools/missing-macros/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=missing-macros
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=missing-macros

-PKG_VERSION:=9
+PKG_VERSION:=10

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/missing-macros/src/m4/fake-gtk-doc-check.m4 b/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
index 501881314b3ab2ea509879c90cf7d7eea233e97f..26fa7234f3b5c58536d51cb51c0adf23cefaf5fe 100644 (file)
--- a/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
+++ b/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
@@ -9,4 +9,5 @@ AC_DEFUN([GTK_DOC_CHECK],
        AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [false])
        AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [false])
        AM_CONDITIONAL([GTK_DOC_USE_REBASE], [false])
        AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [false])
        AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [false])
        AM_CONDITIONAL([GTK_DOC_USE_REBASE], [false])

+       AC_PATH_PROGS([GTKDOC_REBASE],[true],[true])

 ])
 ])