svn commit: r950779 - in /couchdb/trunk: Makefile.am THANKS configure.ac license.skip

[ja...@apache.org]

Author: jan
Date: Wed Jun  2 21:47:28 2010
New Revision: 950779

URL: http://svn.apache.org/viewvc?rev=950779&view=rev
Log:
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.

Modified:
    couchdb/trunk/Makefile.am
    couchdb/trunk/THANKS
    couchdb/trunk/configure.ac
    couchdb/trunk/license.skip

Modified: couchdb/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/Makefile.am?rev=950779&r1=950778&r2=950779&view=diff
==============================================================================
--- couchdb/trunk/Makefile.am (original)
+++ couchdb/trunk/Makefile.am Wed Jun  2 21:47:28 2010
@@ -12,6 +12,8 @@
 
 SUBDIRS = bin etc src share test var utils
 
+ACLOCAL_AMFLAGS = -I m4
+
 localdoc_DATA = \
     AUTHORS.gz \
     BUGS.gz \

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=950779&r1=950778&r2=950779&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Wed Jun  2 21:47:28 2010
@@ -57,5 +57,6 @@ suggesting improvements or submitting ch
  * Gavin Sherry <sw...@alcove.com.au>
  * Timothy Smith <ti...@couch.io>
  * Martin Haaß <Ma...@gmx.net>
+ * Hans Ulrich Niedermann <hu...@n-dimensional.de>
 
 For a list of authors see the `AUTHORS` file.

Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=950779&r1=950778&r2=950779&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Wed Jun  2 21:47:28 2010
@@ -10,15 +10,13 @@ dnl WARRANTIES OR CONDITIONS OF ANY KIND
 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])
 

Modified: couchdb/trunk/license.skip
URL: http://svn.apache.org/viewvc/couchdb/trunk/license.skip?rev=950779&r1=950778&r2=950779&view=diff
==============================================================================
--- couchdb/trunk/license.skip (original)
+++ couchdb/trunk/license.skip Wed Jun  2 21:47:28 2010
@@ -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