/pidgin/main: 1c082451371d: Fix kwallet build on Ubuntu 14.04

Tomasz Wasilczyk twasilczyk at pidgin.im
Mon Apr 28 04:57:42 EDT 2014


Changeset: 1c082451371dc7541300cee5b167bccf88e0e82d
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-28 10:57 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1c082451371d

Description:

Fix kwallet build on Ubuntu 14.04

diffstat:

 configure.ac |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1867,7 +1867,7 @@ fi
 
 AC_LANG_PUSH([C++])
 CPPFLAGS_save="$CPPFLAGS"
-LDFLAGS_save="$LDFLAGS"
+LIBS_save="$LIBS"
 
 if test "x$enable_kwallet" = "xyes"; then
 	PKG_CHECK_MODULES(QT4, [QtCore], [
@@ -1936,7 +1936,7 @@ if test "x$enable_kwallet" = "xyes"; the
 		KWALLET_LIBS="-lkdeui"
 	fi
 	KWALLET_LIBS="$KWALLET_LIBS"
-	LDFLAGS="$LDFLAGS $KWALLET_LIBS $QT4_LIBS"
+	LIBS="$LIBS $KWALLET_LIBS $QT4_LIBS"
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <kwallet.h>],
 		[KWallet::Wallet::LocalWallet();])], [AC_MSG_RESULT([yes])],
 		[
@@ -1952,7 +1952,7 @@ Use --disable-kwallet if you do not need
 fi
 
 CPPFLAGS="$CPPFLAGS_save"
-LDFLAGS="$LDFLAGS_save"
+LIBS="$LIBS_save"
 AC_LANG_POP
 
 AC_SUBST(KWALLET_CXXFLAGS)



More information about the Commits mailing list