[git] GpgOL - branch, master, updated. gpgol-1.3.0-24-g5b3b0c2

[by Andre Heinecke]

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 "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  5b3b0c233666a0492ee62a8b257a6125d30211d6 (commit)
      from  d1648f24e6abaaf9550671b0b6ddad56632a1cf3 (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 5b3b0c233666a0492ee62a8b257a6125d30211d6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Dec 9 11:52:09 2015 +0100

    Add option to use Gpg4win-3 registry keys
    
    * configure.ac: Add --enable-gpg4win-3-reg-keys
    * src/common.h: Include config.h
    
    --
    The registry key layout changed with gpg4win-3 to no longer
    conflict with GnuPG registry keys.

diff --git a/configure.ac b/configure.ac
index 06d7fd1..3f437f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,14 @@ if test "$mime_send" != "no"; then
    [Sending Mime messages will be supported.])
 fi
 
+AC_ARG_ENABLE(gpg4win-3-reg-keys,
+            AC_HELP_STRING([--enable-gpg4win-3-reg-keys], [Use the gpg4win-3 style registry keys]),
+            new_keys=$enableval, new_keys=no)
+if test "$new_keys" != "no"; then
+  AC_DEFINE(NEW_STYLE_REG_KEYS, 1,
+   [The registry keys of Gpg4win-3 will be used])
+fi
+
 #
 # Print errors here so that they are visible all
 # together and the user can acquire them all together.
diff --git a/src/common.h b/src/common.h
index 3d09446..4316697 100644
--- a/src/common.h
+++ b/src/common.h
@@ -25,6 +25,9 @@
 
 #include "util.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

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

Summary of changes:
 configure.ac | 8 ++++++++
 src/common.h | 3 +++
 2 files changed, 11 insertions(+)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org