[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 01/03: configure.ac: do not ignore user-def
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 01/03: configure.ac: do not ignore user-defined GNUTLS_{CPP, LD}FLAGS |
Date: |
Mon, 06 Nov 2017 19:16:58 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 042ca763558b9ce724e9850f9a89fa5aefe943ab
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Mon Nov 6 18:32:41 2017 +0300
configure.ac: do not ignore user-defined GNUTLS_{CPP,LD}FLAGS
---
configure.ac | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 842b8604..abf436c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1345,8 +1345,6 @@ AC_CHECK_PROG([have_socat],[socat], [yes], [no])
AM_CONDITIONAL([HAVE_ZZUF], [test "x$have_zzuf" = "xyes"])
AM_CONDITIONAL([HAVE_SOCAT], [test "x$have_socat" = "xyes"])
-GNUTLS_CPPFLAGS=""
-GNUTLS_LDFLAGS=""
have_gnutls=no
have_gnutls_sni=no
have_gcrypt=no
@@ -1371,6 +1369,8 @@ AC_ARG_WITH([[gnutls]],
case $with_gnutls in
no)
AC_MSG_RESULT([[GnuTLS disabled]])
+ AS_UNSET([GNUTLS_CPPFLAGS])
+ AS_UNSET([GNUTLS_LDFLAGS])
;;
yes)
AC_MSG_RESULT([[automatically, forced]])
@@ -1449,6 +1449,8 @@ AS_IF([test "x$with_gnutls" != "xno" && test
"x$have_gnutls" != "xyes"],
CFLAGS="$SAVE_CFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
LIBS="$SAVE_LIBS"
+ AS_UNSET([GNUTLS_CPPFLAGS])
+ AS_UNSET([GNUTLS_LDFLAGS])
],
[
# check for GnuTLS at default paths
@@ -1538,6 +1540,10 @@ choke me now
CFLAGS="$SAVE_CFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
LIBS="$SAVE_LIBS"
+ ],
+ [
+ AS_UNSET([GNUTLS_CPPFLAGS])
+ AS_UNSET([GNUTLS_LDFLAGS])
]
)
--
To stop receiving notification emails like this one, please contact
address@hidden