[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-220-g82c25e6

[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 "The GNU Privacy Guard".

The branch, master has been updated
       via  82c25e67a1669febb5332b3e9bc4652e6855fdca (commit)
       via  043e2728c813299fafcf62cd125ecf872b26179e (commit)
      from  95d496cb7a897240c6f09ccb4e04926d59326cbc (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 82c25e67a1669febb5332b3e9bc4652e6855fdca
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 27 09:28:43 2013 +0200

    Modernize two format string file name quotes.
    
    --

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 94538b3..39435aa 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -760,7 +760,7 @@ open_control_file (control_file_t *r_cf, int append)
       if (!stream)
         {
           err = gpg_error_from_syserror ();
-          log_error (_("can't create `%s': %s\n"),
+          log_error (_("can't create '%s': %s\n"),
                      cf->fname, gpg_strerror (err));
           goto leave;
         }
@@ -772,7 +772,7 @@ open_control_file (control_file_t *r_cf, int append)
   if (!cf->fp)
     {
       err = gpg_error_from_syserror ();
-      log_error (_("can't open `%s': %s\n"),
+      log_error (_("can't open '%s': %s\n"),
                  cf->fname, gpg_strerror (err));
       goto leave;
     }

commit 043e2728c813299fafcf62cd125ecf872b26179e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 27 09:22:00 2013 +0200

    Prepare for newer automake versions.
    
    * configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
    option form.  Add options from the top Makefile.
    (AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
    * Makefile.am (AUTOMAKE_OPTIONS): Remove.
    
    * kbx/Makefile.am: Remove INCLUDES.  Include cmacros.am.  FActor some
    AM_CPPFLAGS options to  AM_CFLAGS.

diff --git a/Makefile.am b/Makefile.am
index c5ac11c..c9a7b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
diff --git a/configure.ac b/configure.ac
index 5335e56..01530e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,10 +63,12 @@ PACKAGE=$PACKAGE_NAME
 PACKAGE_GT=${PACKAGE_NAME}2
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_AUX_DIR(scripts)
-AC_CONFIG_SRCDIR(sm/gpgsm.c)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR([scripts])
+AC_CONFIG_SRCDIR([sm/gpgsm.c])
+AC_CONFIG_HEADER([config.h])
+# Note: For automake 1.13 add the option
+#          serial-tests
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AC_CANONICAL_HOST
 AB_INIT
 
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 894924e..d7edb25 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -18,12 +18,14 @@
 
 ## Process this file with automake to produce Makefile.in
 
-localedir = $(datadir)/locale
-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
-
 EXTRA_DIST = mkerrors
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \
-	       $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
+	      -I$(top_srcdir)/intl
+
+include $(top_srcdir)/am/cmacros.am
+
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 
 noinst_LIBRARIES = libkeybox.a
 bin_PROGRAMS = kbxutil

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

Summary of changes:
 Makefile.am         |    1 -
 agent/command-ssh.c |    4 ++--
 configure.ac        |   10 ++++++----
 kbx/Makefile.am     |   12 +++++++-----
 4 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org