[java-libglom] Require automake-1.11.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-libglom] Require automake-1.11.
- Date: Tue, 17 Apr 2012 20:02:44 +0000 (UTC)
commit c3d7824123f8ff6e807362d37ba5c366658cd048
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Apr 17 22:02:38 2012 +0200
Require automake-1.11.
* Makefile.am: Update the comment.
* configure.ac: Depend on automake 1.11 (the latest version),
because the Makefile.am depends on its behaviour, and it
will not work with earlier versions.
ChangeLog | 9 +++++++++
Makefile.am | 2 +-
configure.ac | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1becff3..23d7ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-17 Murray Cumming <murrayc murrayc com>
+
+ Require automake-1.11.
+
+ * Makefile.am: Update the comment.
+ * configure.ac: Depend on automake 1.11 (the latest version),
+ because the Makefile.am depends on its behaviour, and it
+ will not work with earlier versions.
+
2012-04-13 Murray Cumming <murrayc murrayc- com>
DocumentTest: More tests of the report structure.
diff --git a/Makefile.am b/Makefile.am
index dfe7cea..d96d903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,7 +148,7 @@ src/glom_wrap.cc: $(swig_dependencies)
# This use of the .stamp files feels like a hack.
# This used to depend on classdist_noinst.stamp but that is no longer generated,
-# at least with autoconf 2.68. murrayc.
+# at least with automake 1.11. murrayc.
$(jarfile): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $(top_builddir)/$(jarfile) org
diff --git a/configure.ac b/configure.ac
index e359b61..0f26202 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_PREREQ([2.58])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.8 -Wall gnu no-define nostdinc])
+AM_INIT_AUTOMAKE([1.11 -Wall gnu no-define nostdinc])
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
AC_LANG([C++])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]