[PATCH 1/2] Modernize autotools configuration

Thierry Reding thierry.reding at gmail.com
Wed Sep 4 14:34:35 CEST 2013


Two- and three-argument forms of the AM_INIT_AUTOMAKE macro have been
deprecated for quite a while and are no longer supported starting with
automake 1.14.

While at it, put M4 macros into a m4 subdirectory as recommended by the
autotools.

Signed-off-by: Thierry Reding <thierry.reding at gmail.com>
---
 Makefile.am  | 1 +
 autogen.sh   | 1 +
 configure.ac | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 059305b..f3a5eb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
 VERSION_INFO = 4:0:0
 
diff --git a/autogen.sh b/autogen.sh
index 8056ee7..cbd3ec3 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+test -d m4 || mkdir m4
 autoreconf --install --symlink --force
diff --git a/configure.ac b/configure.ac
index 80b18cb..7b240b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
-AC_INIT
+AC_INIT([libev], [4.15]) dnl also update ev.h!
 
 orig_CFLAGS="$CFLAGS"
 
 AC_CONFIG_SRCDIR([ev_epoll.c])
 
-AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h!
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
-- 
1.8.4




More information about the libev mailing list