From bcd9295d5b9c9f46478bff0680f57bd71b4061f8 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 15 Dec 2014 12:15:44 +0100
Subject: Fix commit 754a987.

* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New.
(AUTOMAKE_OPTIONS): Move options to ...
* configure.ac (AM_INIT_AUTOMAKE): .. here.
(BUILD_DOC): Fix commit 754a987.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 27fda63..c1ea013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x00" mym4_version_major \
 AC_SUBST(VERSION_NUMBER)
 
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/err-sources.h.in])
 AC_CONFIG_HEADER([config.h])
@@ -516,7 +516,7 @@ build_doc=yes
 AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
                                     [do not build the documentation]),
                      build_doc=$enableval, build_doc=yes)
-AM_CONDITIONAL([BUILD_DOC], [test "x$enable_languages" != xno])
+AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
 
 
 #
-- 
cgit v1.2.3