You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2010/06/02 23:50:26 UTC
svn commit: r950783 - in /couchdb/branches/0.11.x: Makefile.am THANKS
configure.ac license.skip
Author: jan
Date: Wed Jun 2 21:50:25 2010
New Revision: 950783
URL: http://svn.apache.org/viewvc?rev=950783&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/branches/0.11.x/Makefile.am
couchdb/branches/0.11.x/THANKS
couchdb/branches/0.11.x/configure.ac
couchdb/branches/0.11.x/license.skip
Modified: couchdb/branches/0.11.x/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/Makefile.am?rev=950783&r1=950782&r2=950783&view=diff
==============================================================================
--- couchdb/branches/0.11.x/Makefile.am (original)
+++ couchdb/branches/0.11.x/Makefile.am Wed Jun 2 21:50:25 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/branches/0.11.x/THANKS
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/THANKS?rev=950783&r1=950782&r2=950783&view=diff
==============================================================================
--- couchdb/branches/0.11.x/THANKS (original)
+++ couchdb/branches/0.11.x/THANKS Wed Jun 2 21:50:25 2010
@@ -54,5 +54,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/branches/0.11.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/configure.ac?rev=950783&r1=950782&r2=950783&view=diff
==============================================================================
--- couchdb/branches/0.11.x/configure.ac (original)
+++ couchdb/branches/0.11.x/configure.ac Wed Jun 2 21:50:25 2010
@@ -10,14 +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])
-
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/branches/0.11.x/license.skip
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/license.skip?rev=950783&r1=950782&r2=950783&view=diff
==============================================================================
--- couchdb/branches/0.11.x/license.skip (original)
+++ couchdb/branches/0.11.x/license.skip Wed Jun 2 21:50:25 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