diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-03-13 13:58:08 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-03-13 13:58:08 -0400 |
| commit | 2394a2d6f905acd25c5fd9a6187f6a09396edac9 (patch) | |
| tree | 1c836dc6947ad88c54b6291e3ba94edda5125e9a | |
| parent | 132ea816d7b76adaa8ae764077bff6387d979e72 (diff) | |
| download | dconf-2394a2d6f905acd25c5fd9a6187f6a09396edac9.tar.gz | |
build: drop back to automake 1.11.2
It seems like 1.13 is still a bit too cutting-edge for some (including
Debian wheezy and gnome-continuous).
Drop the dependency back to 1.11.2 and add back ACLOCAL_AMFLAGS (but
without ACLOCAL_FLAGS).
We can reevaluate after jessie is released.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 75d3f7f..8c1a485 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ include Makefile.gtester +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = shm gvdb common engine service gdbus gsettings dbus-1 client bin docs tests po if ENABLE_EDITOR diff --git a/configure.ac b/configure.ac index a9892cd..3d02835 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([aux]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.13 foreign -Wno-portability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11.2 foreign -Wno-portability no-dist-gzip dist-xz]) AM_SILENT_RULES([yes]) # Set default CFLAGS before AC_PROG_CC does |