[git] Pinentry - branch, master, updated. pinentry-0.8.3-13-g52cf95c

by Andre Heinecke cvs at cvs.gnupg.org
Wed Aug 6 16:24:07 CEST 2014


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  52cf95c4fd97dc38856e72aa3e42a135d010df06 (commit)
      from  f4d14ffcf2e04b1938c00a0ef1504e0e932631fd (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 52cf95c4fd97dc38856e72aa3e42a135d010df06
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 6 16:09:55 2014 +0200

    Check for MOC also if pinentry-qt is disabled
    
      * configure.ac: Call QT_PATH_MOC if pinentry_qt4 is not no.
    
    --
      Previously the MOC lookup from m4/qt.m4 would only be called
      if pinentry-qt was at least maybe. The MOC variable defined by
      this macro is also used in pinentry-qt4 though.

diff --git a/configure.ac b/configure.ac
index b4133b0..595c2aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -427,6 +427,7 @@ fi)
 fi
 
 if test "$pinentry_qt4" != "no"; then
+QT_PATH_MOC
 PKG_CHECK_MODULES(QT4_GUI, QtGui,,
 if test "$pinentry_qt4" = "yes"; then
     AC_MSG_ERROR([[

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

Summary of changes:
 configure.ac |    1 +
 1 file changed, 1 insertion(+)


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




More information about the Gnupg-commits mailing list