summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@sourcefrog.net>2014-04-22 21:08:51 +1000
committerMartin Pool <mbp@sourcefrog.net>2014-04-22 21:08:51 +1000
commit9e642e0a84da8e9467b824a3055f82fb7c459630 (patch)
tree048513295809e6d74e1351bb7a3155d78b27b034
parent4315404d336f00d0952eaca74b63c0a9cb1ca4eb (diff)
downloadlibrsync-9e642e0a84da8e9467b824a3055f82fb7c459630.tar.gz
Take automake's advice about new-style m4 includes
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac3
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 189f315..ad8bddc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ rdiff
librsync.la
librsync-[0-9]*tar.gz
librsync-[0-9]*/
+/m4/
diff --git a/Makefile.am b/Makefile.am
index 700e77d..71f93ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = doc testsuite
+ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 config.guess config.h.in config.sub configure \
diff --git a/configure.ac b/configure.ac
index c81a938..6c17e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,10 @@
AC_PREREQ(2.53)
AC_INIT([librsync],[0.9.8pre])
AC_REVISION([$Revision$])
-AC_COPYRIGHT([Copyright (C) 1999, 2000, 01, 02, 04 by Martin Pool <mbp@samba.org>])
+AC_COPYRIGHT([Copyright (C) 1999-2014 by Martin Pool <mbp@sourcefrog.net>])
AC_CONFIG_SRCDIR([trace.c])
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
# GNU library versioning: This is NOT the librsync release number.