taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save and restore CFLAGS/LDFLAGS/LIBS when checking for gnurl/curl

Browse Source
This commit is contained in:
Florian Dold 2019-05-01 02:41:40 +02:00
parent 6e33de941e
commit cce67665f7
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -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 # check for libgnurl
# 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. # Check for GNUnet's libgnunetpq.
libgnunetpq=0 libgnunetpq=0
@ -325,9 +333,9 @@ else
CFLAGS_SAVE=$CFLAGS CFLAGS_SAVE=$CFLAGS
LDFLAGS_SAVE=$LDFLAGS LDFLAGS_SAVE=$LDFLAGS
LIBS_SAVE=$LIBS
CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS" LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS"
LIBS_SAVE="$LIBS"
LIBS="-lgcrypt -lgpg-error $LIBS" LIBS="-lgcrypt -lgpg-error $LIBS"