diff options
| author | Jan Lehnardt <jan@apache.org> | 2010-06-02 21:47:28 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2010-06-02 21:47:28 +0000 |
| commit | 9807cda46b01f31bc77025c34a8b7f4275be6563 (patch) | |
| tree | 50b3e9130927922b05e058989924d9819ddc146e /configure.ac | |
| parent | e699b56c551ab3225789d6dd1951fb7341854c9c (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 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
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]) |