diff options
| author | ng0 <ng0@n0.is> | 2019-05-07 14:35:32 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-05-07 14:35:32 +0000 |
| commit | 105555b46975edef914fc39195941cf14d64e760 (patch) | |
| tree | 81f2529f09a7b66f4510a8f6ef8099ce3ea2acfe /configure.ac | |
| parent | 0d8f5035437d5a0daff3505978bc60dad50f55f2 (diff) | |
| parent | a16c32a4745634b77439200ee4831fed2811fd8a (diff) | |
Merge branch 'master' of git.taler.net:exchange
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
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" |