From 817ea36924ca1248672810fd57dd3e337db13401 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 8 Feb 2013 13:03:29 -0500 Subject: [PATCH 1/3] Use AC_CONFIG_HEADERS in place of AM_CONFIG_HEADERS for autmake 1.13 compat Patch from cazfi. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 189988a2..09898d27 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_INIT(event.c) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(libevent,2.0.21-stable-dev) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_DEFINE(NUMERIC_VERSION, 0x02001501, [Numeric representation of the version]) dnl Initialize prefix. From 0c79787a979330bff7e2f8d9dd25c9a27bfd6edb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 8 Feb 2013 22:07:43 -0500 Subject: [PATCH 2/3] Rename configure.in to configure.ac to appease newer autoconfs --- configure.in => configure.ac | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configure.in => configure.ac (100%) diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac From a55514eeed96b9bf9a16fbed1a709dfcce5a6080 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 8 Feb 2013 22:08:18 -0500 Subject: [PATCH 3/3] Avoid using top_srcdir in TESTS-new automakes do not like this --- test/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index b10c41a8..0253a491 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -19,7 +19,14 @@ endif EXTRA_PROGRAMS = regress noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h -TESTS = $(top_srcdir)/test/test.sh +# We need to copy this file, since automake doesn't want us to use top_srcdir +# in TESTS. +TESTS = test-script.sh + +test-script.sh: test.sh + cp $< $@ + +DISTCLEANFILES = test-script.sh BUILT_SOURCES = if BUILD_REGRESS @@ -91,7 +98,7 @@ rpcgen-attempted: $(srcdir)/regress.rpc $(srcdir)/../event_rpcgen.py $(srcdir)/r CLEANFILES = rpcgen-attempted -DISTCLEANFILES = *~ +DISTCLEANFILES += *~ verify: check