summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-06-02 21:47:28 +0000
committerJan Lehnardt <jan@apache.org>2010-06-02 21:47:28 +0000
commit9807cda46b01f31bc77025c34a8b7f4275be6563 (patch)
tree50b3e9130927922b05e058989924d9819ddc146e /Makefile.am
parente699b56c551ab3225789d6dd1951fb7341854c9c (diff)
If aclocal needs to be called during a build, its options are taken
from ACLOCAL_AMFLAGS in the top-level Makefile.am - which were not defined before. Additionally, this removes the need for the explicit m4_include of m4/ac_check_icu.m4 at the very top of configure.ac. Patch by Hans Ulrich Niedermann. Closes COUCHDB-165 and COUCHDB-414. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@950779 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 472b01c1..9dbcb8aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@
SUBDIRS = bin etc src share test var utils
+ACLOCAL_AMFLAGS = -I m4
+
localdoc_DATA = \
AUTHORS.gz \
BUGS.gz \