gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-exchange] branch master updated: save and restore CF


From: gnunet
Subject: [GNUnet-SVN] [taler-exchange] branch master updated: save and restore CFLAGS/LDFLAGS/LIBS when checking for gnurl/curl
Date: Wed, 01 May 2019 02:42:05 +0200

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

dold pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new cce67665 save and restore CFLAGS/LDFLAGS/LIBS when checking for 
gnurl/curl
cce67665 is described below

commit cce67665f702fe10df64c1bad6a1bf6cf19c06ab
Author: Florian Dold <address@hidden>
AuthorDate: Wed May 1 02:41:40 2019 +0200

    save and restore CFLAGS/LDFLAGS/LIBS when checking for gnurl/curl
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 842f24a5..3c1d9dd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,10 @@ AS_IF([test $libgnunetjson != 1],
 *** ]])])
 
 
+# Save before checking libgnurl/libcurl
+CFLAGS_SAVE=$CFLAGS
+LDFLAGS_SAVE=$LDFLAGS
+LIBS_SAVE=$LIBS
 
 # check for libgnurl
 # libgnurl
@@ -240,6 +244,10 @@ AS_IF([test $libgnunetcurl != 1],
 *** ]])])
 
 
+# Restore after gnurl/curl checks messed up these values
+CFLAGS=$CFLAGS_SAVE
+LDFLAGS=$LDFLAGS_SAVE
+LIBS=$LIBS_SAVE
 
 # Check for GNUnet's libgnunetpq.
 libgnunetpq=0
@@ -325,9 +333,9 @@ else
 
 CFLAGS_SAVE=$CFLAGS
 LDFLAGS_SAVE=$LDFLAGS
+LIBS_SAVE=$LIBS
 CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
 LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS"
-LIBS_SAVE="$LIBS"
 LIBS="-lgcrypt -lgpg-error $LIBS"
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]