[tools] missing-macros: extend fake-gtk-doc-check.m4 (fixes autoreconf in orbit2...

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

diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile
index 8a2eb5f..4f75646 100644 (file)
--- a/tools/missing-macros/Makefile
+++ b/tools/missing-macros/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=missing-macros
-PKG_VERSION:=5
+PKG_VERSION:=6
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/missing-macros/src/README b/tools/missing-macros/src/README
index 3107354..9d9fbfa 100644 (file)
--- a/tools/missing-macros/src/README
+++ b/tools/missing-macros/src/README
@@ -65,3 +65,7 @@ From OpenWrt:
 Always disable GTK docs.
 
   fake-gtk-doc-check.m4
+
+Provide intltool.m4 stubs to allow for autoreconf.
+
+  fake-intltool.m4

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 b4954dd..5018813 100644 (file)
--- a/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
+++ b/tools/missing-macros/src/m4/fake-gtk-doc-check.m4
@@ -2,4 +2,11 @@ dnl fake-gtk-doc-check.m4 serial 1 (OpenWrt)
 dnl Provide a fake GTK_DOC_CHECK macros which
 dnl always defines false.
 
-AC_DEFUN([GTK_DOC_CHECK],[AM_CONDITIONAL(ENABLE_GTK_DOC,false)])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+       AM_CONDITIONAL([ENABLE_GTK_DOC], [false])
+       AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [false])
+       AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [false])
+       AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [false])
+       AM_CONDITIONAL([GTK_DOC_USE_REBASE], [false])
+])

diff --git a/tools/missing-macros/src/m4/fake-intltool.m4 b/tools/missing-macros/src/m4/fake-intltool.m4
new file mode 100644 (file)
index 0000000..352053c
--- /dev/null
+++ b/tools/missing-macros/src/m4/fake-intltool.m4
@@ -0,0 +1,16 @@
+# stripped intltool.m4 to make automake happy
+# serial 1
+AC_DEFUN([IT_PROG_INTLTOOL],
+[
+       AC_SUBST(ALL_LINGUAS)
+       
+       DATADIRNAME=share
+       AC_SUBST(DATADIRNAME)
+])
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+