[dconf] build: drop back to automake 1.11.2
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf] build: drop back to automake 1.11.2
- Date: Thu, 13 Mar 2014 18:04:56 +0000 (UTC)
commit 2394a2d6f905acd25c5fd9a6187f6a09396edac9
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Mar 13 13:58:08 2014 -0400
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.
Makefile.am | 2 ++
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]