diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-24 14:49:48 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-27 13:16:15 +0100 |
| commit | e5cced55a6a9060626fd3037d40399c283479e5a (patch) | |
| tree | e4c048e262bd6b4ccb8b6c9787e26ca5d464af61 | |
| parent | 130e3a3f1188885f103c8ffe17b777c161765ce3 (diff) | |
| download | telepathy-glib-e5cced55a6a9060626fd3037d40399c283479e5a.tar.gz | |
Require automake 1.11 unconditionally
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 3 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index ab23ce650..159797fb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,17 +47,6 @@ upload-branch-docs: all rsync -rtzvPp --chmod=a+rX docs/reference/html/ \ $(UPLOAD_BRANCH_TO)-$(BRANCH)/ -if HAVE_AUTOMAKE_FOR_DIST -# automake is new enough to make dist -else -dist-hook: dist-hook-check-am -dist-hook-check-am: - @echo "*** Your automake is too old to compile Vala.">&2 - @echo "*** You can build telepathy-glib with this automake, but you">&2 - @echo "*** should not use it to make tarball releases.">&2 - @exit 1 -endif - include tools/lcov.am CHANGELOG_RANGE = telepathy-glib-0.8.0.. diff --git a/configure.ac b/configure.ac index 3c7936f39..6e43a46ea 100644 --- a/configure.ac +++ b/configure.ac @@ -42,17 +42,10 @@ AC_INIT([Telepathy-GLib], [tp_glib_version], AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_CONFIG_HEADER(config.h) -dnl We're compatible with automake 1.9 (to be nice to Maemo 5), but with -dnl reduced functionality -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -m4_ifdef([AM_PROG_VALAC], - [have_automake_for_dist=true], - [AC_MSG_WARN([You have Automake < 1.11, 'make dist' will not work]) - have_automake_for_dist=false]) -AM_CONDITIONAL([HAVE_AUTOMAKE_FOR_DIST], [$have_automake_for_dist]) +AM_SILENT_RULES dnl check for tools AC_PROG_CC @@ -221,8 +214,7 @@ if test x$enable_vala_bindings = xyes; then [], [AC_MSG_ERROR([gobject-introspection 0.9.6 required for Vala bindings])]) - m4_ifdef([AM_PROG_VALAC], [AM_PROG_VALAC(0.10.0)], - [AC_MSG_ERROR([Automake >= 1.11 required for Vala bindings])]) + AM_PROG_VALAC([0.10.0]) have_vala=yes AC_PATH_PROG(VALAC, valac, valac) |