[git] GPGME - branch, master, updated. gpgme-1.6.0-225-g938f7e9

[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  938f7e9c8b466594d05c0347fe627b225263a6a6 (commit)
       via  744978cce8f9dfb2363b9d274ee99f25cfcf0e40 (commit)
      from  bf742fb88545689addfca18192baf2f56a1895e1 (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 938f7e9c8b466594d05c0347fe627b225263a6a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 12 15:26:14 2016 +0200

    m4: Don't set fpic for qt on windows
    
    * m4/qt.m4 (FIND_QT): Do not set fpic for windows.
    
    --
    Otherwise each compile call will result in a warning that
    fpic is ignored for windows.

diff --git a/m4/qt.m4 b/m4/qt.m4
index 7a81bff..e7aac41 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -23,8 +23,10 @@ AC_DEFUN([FIND_QT],
                     [have_qt5test_libs="yes"],
                     [have_qt5test_libs="no"])
 
-  if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
-    GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic"
+  if ! test "$have_w32_system" = yes; then
+    if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+      GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic"
+    fi
   fi
   if test "$have_qt5_libs" = "yes"; then
     AC_CHECK_TOOL(MOC, moc)

commit 744978cce8f9dfb2363b9d274ee99f25cfcf0e40
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 12 15:10:16 2016 +0200

    m4: Use LIBS instead of LDFLAGS for Qt libs
    
    * m4/qt.m4: Modify LIBS instead of LDFLAGS for link test.
    
    --
    The test would otherwise fail when building for windows because the
    link order was wrong.

diff --git a/m4/qt.m4 b/m4/qt.m4
index 1acae81..7a81bff 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -60,8 +60,8 @@ AC_DEFUN([FIND_QT],
     dnl for host.
     OLDCPPFLAGS=$CPPFLAGS
     CPPFLAGS=$GPGME_QT_CFLAGS
-    OLDLDFLAGS=$LDFLAGS
-    LDFLAGS=$GPGME_QT_LIBS
+    OLDLIBS=$LIBS
+    LIBS=$GPGME_QT_LIBS
     AC_LANG_PUSH(C++)
     AC_MSG_CHECKING([whether a simple qt program can be built])
     AC_LINK_IFELSE([AC_LANG_SOURCE([
@@ -73,6 +73,6 @@ AC_DEFUN([FIND_QT],
     AC_MSG_RESULT([$have_qt5_libs])
     AC_LANG_POP()
     CPPFLAGS=$OLDCPPFLAGS
-    LDFLAGS=$OLDLDFLAGS
+    LIBS=$OLDLIBS
   fi
 ])

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

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


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