[git] GnuPG - branch, master, updated. gnupg-2.1.11-35-ge1ceff1

[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  e1ceff16765b0342531709cf97d03ef0158c29d5 (commit)
       via  44b02e1beb4f38f26551d932827d5317fddd27c2 (commit)
      from  2f02ed75a9671a7aae36968d5a1618f71b491325 (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 e1ceff16765b0342531709cf97d03ef0158c29d5
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Feb 16 16:47:22 2016 +0100

    w32: Make scdaemon build again due to libusb problem.
    
    * configure.ac: Add hack to disable libusb for Windows.  Also use
    $host instead of $target in the switch
     --
    
    The new test for libusb does not support cross-compiling.  As a quick
    workaround we disable libusb for Windows because we can't use it anyway.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 81fde82..7770894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,7 +783,11 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
 #
 # FiXME: Use GNUPG_CHECK_LIBUSB and modify to use separate AC_SUBSTs.
 if test "$use_ccid_driver" = yes ; then
-   case $target in
+   case "${host}" in
+     *-mingw32*)
+       LIBUSB_LIBS=
+       LIBUSB_CPPFLAGS=
+       ;;
      *-*-darwin*)
        LIBUSB_LIBS="-lusb-1.0 -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
        ;;
@@ -795,6 +799,8 @@ if test "$use_ccid_driver" = yes ; then
        LIBUSB_LIBS="-lusb-1.0"
        ;;
    esac
+fi
+if test x"$LIBUSB_LIBS" != x ; then
    AC_CHECK_LIB(usb-1.0, libusb_init,
                 [ LIBUSB_LIBS="$LIBUSB_LIBS"
                   have_libusb=yes ])

commit 44b02e1beb4f38f26551d932827d5317fddd27c2
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Feb 16 16:07:44 2016 +0100

    w32: Do not error out if gpgconf is not installed.
    
    * common/homedir.c (check_portable_app): Remove error message.
    --
    
    It is sometimes useful to install just gpgv and no other parts.  Our
    test for a portable application returned an error if gpgconf is not
    installed.  That error is not required but was merely a debug aid.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/homedir.c b/common/homedir.c
index 3918693..e0a88fa 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -256,9 +256,7 @@ check_portable_app (const char *dir)
   char *fname;
 
   fname = xstrconcat (dir, DIRSEP_S "gpgconf.exe", NULL);
-  if (access (fname, F_OK))
-    log_error ("required binary '%s' is not installed\n", fname);
-  else
+  if (!access (fname, F_OK))
     {
       strcpy (fname + strlen (fname) - 3, "ctl");
       if (!access (fname, F_OK))

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

Summary of changes:
 common/homedir.c | 4 +---
 configure.ac     | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)


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