[git] GPGME - branch, master, updated. gpgme-1.6.0-217-ged07031

[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 Made Easy".

The branch, master has been updated
       via  ed070313155a1c79a57ba69f4299f2aefc65fad7 (commit)
      from  007382ce94a6318557370c440f7d609a030a119e (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 ed070313155a1c79a57ba69f4299f2aefc65fad7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 11 18:47:11 2016 +0200

    m4: Add compile / link check for qt
    
    * m4/qt.m4 (FIND_QT): Check if a qt application can be compiled and
    linked.
    
    --
    In case gpgme is cross compiled pkg-config may pick up qt
    for the build system and not for the host system. To avoid that
    we check that we can compile a qt program for host.

diff --git a/m4/qt.m4 b/m4/qt.m4
index d3be7f8..1acae81 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -52,5 +52,27 @@ AC_DEFUN([FIND_QT],
         MOC=$MOC2
       fi
     fi
+    AC_MSG_RESULT([$mocversion])
+    dnl Check that a binary can actually be build with this qt.
+    dnl pkg-config may be set up in a way that it looks also for libaries
+    dnl of the build system and not only for the host system. In that case
+    dnl we check here that we can actually compile / link a qt application
+    dnl for host.
+    OLDCPPFLAGS=$CPPFLAGS
+    CPPFLAGS=$GPGME_QT_CFLAGS
+    OLDLDFLAGS=$LDFLAGS
+    LDFLAGS=$GPGME_QT_LIBS
+    AC_LANG_PUSH(C++)
+    AC_MSG_CHECKING([whether a simple qt program can be built])
+    AC_LINK_IFELSE([AC_LANG_SOURCE([
+    #include <QCoreApplication>
+    int main (int argc, char **argv) {
+    QCoreApplication app(argc, argv);
+    app.exec();
+    }])], [have_qt5_libs='yes'], [have_qt5_libs='no'])
+    AC_MSG_RESULT([$have_qt5_libs])
+    AC_LANG_POP()
+    CPPFLAGS=$OLDCPPFLAGS
+    LDFLAGS=$OLDLDFLAGS
   fi
 ])

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

Summary of changes:
 m4/qt.m4 | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org