[gtksourceview/wip/build-fixes: 1/2] build: don't define ACLOCAL_AMFLAGS (deprecated)
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/build-fixes: 1/2] build: don't define ACLOCAL_AMFLAGS (deprecated)
- Date: Sun, 30 Aug 2015 10:59:58 +0000 (UTC)
commit 3a3366d3349a5b77f4056e27516be3cdc4d14279
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Aug 30 12:41:07 2015 +0200
build: don't define ACLOCAL_AMFLAGS (deprecated)
See the FAQ entry "What's up with ACLOCAL_AMFLAGS?" at:
https://wiki.gnome.org/Projects/GnomeCommon/Migration
It relies on AC_CONFIG_MACRO_DIRS, which was introduced in Automake
1.13. See:
https://mail.gnome.org/archives/desktop-devel-list/2015-June/msg00009.html
https://mail.gnome.org/archives/desktop-devel-list/2015-June/msg00021.html
Makefile.am | 2 --
configure.ac | 2 +-
tests/syntax-highlighting/Makefile.am | 2 --
3 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index de898fd..fef1c27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
SUBDIRS = gtksourceview po data docs tests
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 6e46917..7f14bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_CONFIG_SRCDIR([gtksourceview/gtksourcebuffer.h])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability foreign])
+AM_INIT_AUTOMAKE([1.13 tar-ustar dist-xz no-dist-gzip -Wno-portability foreign])
AM_MAINTAINER_MODE([enable])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/tests/syntax-highlighting/Makefile.am b/tests/syntax-highlighting/Makefile.am
index 319be41..ae46867 100644
--- a/tests/syntax-highlighting/Makefile.am
+++ b/tests/syntax-highlighting/Makefile.am
@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
-
EXTRA_DIST += README.W32
if HAVE_DOXYGEN
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]