[at-spi2-core/wip/meson] build: Modernise configure.ac
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core/wip/meson] build: Modernise configure.ac
- Date: Wed, 24 May 2017 13:21:27 +0000 (UTC)
commit 87e11ddc7bcd1ca1134760302591f8a60bcce6fd
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 24 14:16:38 2017 +0100
build: Modernise configure.ac
We use AM_SILENT_RULES but ask for automake 1.9 at the minimum, which
didn't have AM_SILENT_RULES (they were introduced in 1.11.2).
Additionally, we want AM_PROC_CC_C_O, not AC_PROG_CC, to find out our
C compiler.
configure.ac | 4 ++--
dbind/Makefile.am | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 684c783..1c6988d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,14 +20,14 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.13 -Wall -Wno-portability foreign subdir-objects no-dist-gzip dist-xz])
# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
AM_SILENT_RULES([yes])
-AC_PROG_CC
+AM_PROG_CC_C_O
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
diff --git a/dbind/Makefile.am b/dbind/Makefile.am
index c3d7bb5..201570a 100644
--- a/dbind/Makefile.am
+++ b/dbind/Makefile.am
@@ -1,6 +1,3 @@
-# We build atspi-gmain.c which is located in a different directory.
-AUTOMAKE_OPTIONS = subdir-objects
-
noinst_LTLIBRARIES = libdbind.la
AM_CPPFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]