[git] GPG-ERROR - branch, master, updated. libgpg-error-1.17-12-gbcd9295

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  bcd9295d5b9c9f46478bff0680f57bd71b4061f8 (commit)
      from  754a987f6df59e2ba0e69aada65ae4aaf593c148 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bcd9295d5b9c9f46478bff0680f57bd71b4061f8
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 15 12:15:44 2014 +0100

    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.

diff --git a/Makefile.am b/Makefile.am
index 42cd0c4..e5f3f56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
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])
 
 
 #

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org