From 9807cda46b01f31bc77025c34a8b7f4275be6563 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Wed, 2 Jun 2010 21:47:28 +0000 Subject: 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 --- Makefile.am | 2 ++ THANKS | 1 + configure.ac | 4 +--- license.skip | 3 +-- 4 files changed, 5 insertions(+), 5 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 \ diff --git a/THANKS b/THANKS index 9c02e64d..b6e5cc63 100644 --- a/THANKS +++ b/THANKS @@ -57,5 +57,6 @@ suggesting improvements or submitting changes. Some of these people are: * Gavin Sherry * Timothy Smith * Martin Haaß + * Hans Ulrich Niedermann For a list of authors see the `AUTHORS` file. diff --git a/configure.ac b/configure.ac index c4d530d6..0c089523 100644 --- a/configure.ac +++ b/configure.ac @@ -10,15 +10,13 @@ dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the dnl License for the specific language governing permissions and limitations dnl under the License. -m4_include([m4/ac_check_icu.m4]) -m4_include([m4/ac_check_curl.m4]) - AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_TARNAME]) AC_PREREQ([2.59]) AC_CONFIG_SRCDIR([CHANGES]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER([config.h]) diff --git a/license.skip b/license.skip index f9a388f9..10ff0892 100644 --- a/license.skip +++ b/license.skip @@ -52,8 +52,7 @@ ^etc/windows/README.txt.tpl ^libtool ^license.skip -^m4/ac_check_curl.m4* -^m4/ac_check_icu.m4* +^m4/* ^share/Makefile ^share/Makefile.in ^share/server/json2.js -- cgit v1.2.3