[Pkg-gnupg-commit] [gpgme] 225/412: m4: Don't set fpic for qt on windows

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:52 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

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.
---
 m4/qt.m4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list