diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 09:33:06 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-22 09:33:06 +0000 |
| commit | 6193308054b1404924fa86cc834e933e13a41804 (patch) | |
| tree | 6b93f802ec03a09d409d8af3e4db03155337a524 /tools/missing-macros | |
| parent | fa999ba1e5e0be145cd1915df4003787cf667863 (diff) | |
[tools] missing-macros: extend fake-gtk-doc-check.m4 (fixes autoreconf in orbit2), provide fake-intltool.m4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24787 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/missing-macros')
| -rw-r--r-- | tools/missing-macros/Makefile | 2 | ||||
| -rw-r--r-- | tools/missing-macros/src/README | 4 | ||||
| -rw-r--r-- | tools/missing-macros/src/m4/fake-gtk-doc-check.m4 | 9 | ||||
| -rw-r--r-- | tools/missing-macros/src/m4/fake-intltool.m4 | 16 |
4 files changed, 29 insertions, 2 deletions
diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile index 8a2eb5fd5..4f7564662 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 310735467..9d9fbfa84 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 b4954dda0..501881314 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 000000000..352053c28 --- /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], ...) + |