[git] Pinentry - branch, master, updated. pinentry-0.9.1-16-gaa98f25

[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 standard pinentry collection".

The branch, master has been updated
       via  aa98f25ddcc3c36035f18249443cec15d16e8fa5 (commit)
      from  aaec7c7c50adfb51510962a14c0fa2179a34a01e (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 aa98f25ddcc3c36035f18249443cec15d16e8fa5
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 7 13:29:26 2015 +0200

    w32: Do not build gtk pinentry by default.
    
    * autogen.rc: Remove obsolete options.

diff --git a/autogen.rc b/autogen.rc
index 59441fe..1af4d83 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -7,15 +7,13 @@ case "$myhost:$myhostsub" in
     extraoptions="--disable-pinentry-gtk2 --disable-pinentry-qt4"
     ;;
   w32:)
-    extraoptions="--enable-pinentry-gtk2"
+    extraoptions=""
     ;;
 esac
 
 case "$myhost" in
   w32)
     configure_opts="
-      --disable-pinentry-gtk
-      --disable-pinentry-qt
       --with-libiconv-prefix=@SYSROOT@
       PKG_CONFIG_LIBDIR=@SYSROOT@/lib/pkgconfig
       "
diff --git a/configure.ac b/configure.ac
index 646bc32..271234f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ AC_CHECK_FUNCS(seteuid stpcpy mmap)
 GNUPG_CHECK_MLOCK
 
 dnl Checks for libassuan.
-dnl -> None required becuase we use a stripped down version of libassuan.
+dnl -> None required because we use a stripped down version of libassuan.
 
 
 dnl Checks for libsecmem.

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

Summary of changes:
 autogen.rc   | 4 +---
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org