diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-22 09:33:06 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-22 09:33:06 +0000 |
| commit | aac7b9228454fa68144470b4282c29620e760cba (patch) | |
| tree | 0c03520eb74afad7177482ab79786068ba0fe202 /tools/missing-macros/src | |
| parent | 879e5891c14bc5e9a8076c9db28cfd64e0570db3 (diff) | |
| download | upstream-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/missing-macros/src')
| -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 |
3 files changed, 28 insertions, 1 deletions
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], ...) + |