[git] Pinentry - branch, master, updated. pinentry-0.9.6-3-g08ec955

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

The branch, master has been updated
       via  08ec9556c8a384ea7bb5d42d3f6aab6c2f6a8786 (commit)
      from  9cc13bbd6954928f8a7dae022728c13415816a67 (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 08ec9556c8a384ea7bb5d42d3f6aab6c2f6a8786
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Sep 25 15:56:55 2015 +0200

    Add option to disable looking for qt5
    
    * m4/qt.m4 (FIND_QT): Add --disable-pinentry-qt5 option to
    disable qt5 support even if it is available.
    
    --
    As requested by Kristan F.
    
    GnuPG-bug-id: 2105

diff --git a/m4/qt.m4 b/m4/qt.m4
index 0a7ea99..0e47ec6 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -28,15 +28,24 @@ dnl The moc lookup code is based on libpoppler (rev. d821207)
 
 AC_DEFUN([FIND_QT],
 [
-  PKG_CHECK_MODULES(PINENTRY_QT,
-                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
-                    [have_qt5_libs="yes"],
-                    [have_qt5_libs="no"])
+  AC_ARG_ENABLE(pinentry-qt5,
+                AC_HELP_STRING([--disable-pinentry-qt5],
+                           [Don't use qt5 even if it is available.]),
+                enable_pinentry_qt5=$enableval,
+                enable_pinentry_qt5="try")
 
-  if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
-    PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
-  fi
+  have_qt5_libs = no;
+
+  if test "$enable_pinentry_qt5" != "no"; then
+    PKG_CHECK_MODULES(PINENTRY_QT,
+                      Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
+                      [have_qt5_libs="yes"],
+                      [have_qt5_libs="no"])
 
+    if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
+    fi
+  fi
   if test "$have_qt5_libs" = "yes"; then
     AC_CHECK_TOOL(MOC, moc)
     AC_MSG_CHECKING([moc version])

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

Summary of changes:
 m4/qt.m4 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)


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