[Pkg-gnupg-commit] [gpgme] 224/412: m4: Use LIBS instead of LDFLAGS for Qt libs

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:51 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 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.
---
 m4/qt.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
 ])

-- 
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