diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-17 11:51:53 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-17 11:51:53 +0100 |
| commit | e7df0c7ad266dbd993a3814470a334cee023ab26 (patch) | |
| tree | 00d8528e719d709fd08eeddadf522948ebc12da3 | |
| parent | 80c0a6edfd19b58666136e159b83c6ffc9152aae (diff) | |
Makefile.am, configure.ac: refuse to make dist if automake is too old
This avoids accidentally making tarballs that can't have vala bindings.
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 2083cfe0a..6237ff2db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,6 +45,17 @@ 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 035ecf4bd..2acbe143e 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,14 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 -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]) dnl check for tools AC_PROG_CC |