aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-22 09:33:06 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-22 09:33:06 +0000
commitaac7b9228454fa68144470b4282c29620e760cba (patch)
tree0c03520eb74afad7177482ab79786068ba0fe202 /tools
parent879e5891c14bc5e9a8076c9db28cfd64e0570db3 (diff)
downloadupstream-aac7b9228454fa68144470b4282c29620e760cba.tar.gz
upstream-aac7b9228454fa68144470b4282c29620e760cba.tar.bz2
upstream-aac7b9228454fa68144470b4282c29620e760cba.zip
missing-macros: extend fake-gtk-doc-check.m4 (fixes autoreconf in orbit2), provide fake-intltool.m4
SVN-Revision: 24787
Diffstat (limited to 'tools')
-rw-r--r--tools/missing-macros/Makefile2
-rw-r--r--tools/missing-macros/src/README4
-rw-r--r--tools/missing-macros/src/m4/fake-gtk-doc-check.m49
-rw-r--r--tools/missing-macros/src/m4/fake-intltool.m416
4 files changed, 29 insertions, 2 deletions
diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile
index 8a2eb5fd51..4f7564662f 100644
--- 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 310735467e..9d9fbfa844 100644
--- 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 b4954dda00..501881314b 100644
--- 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
index 0000000000..352053c282
--- /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], ...)
+