diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-24 12:40:15 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-24 12:40:15 +0300 |
commit | 9459be1e04db675324cc1098885357bba2927555 (patch) | |
tree | 6f8cca15d7f4ede7871773d73d1b9e6da8285963 | |
parent | 54cd6ac43708793ee7e03a2ac1038fd86e045030 (diff) | |
download | libmicrohttpd-9459be1e04db675324cc1098885357bba2927555.tar.gz libmicrohttpd-9459be1e04db675324cc1098885357bba2927555.zip |
configure: minor fixing GnuTLS detection in special cases
-rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 873af025..fee368be 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1540,9 +1540,7 @@ choke me now | |||
1540 | SAVE_CFLAGS="$CFLAGS" | 1540 | SAVE_CFLAGS="$CFLAGS" |
1541 | SAVE_LDFLAGS="$LDFLAGS" | 1541 | SAVE_LDFLAGS="$LDFLAGS" |
1542 | SAVE_LIBS="$LIBS" | 1542 | SAVE_LIBS="$LIBS" |
1543 | CPPFLAGS="$GNUTLS_CFLAGS $CPPFLAGS" | ||
1544 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" | 1543 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" |
1545 | LDFLAGS="$GNUTLS_LIBS $LDFLAGS" | ||
1546 | LIBS="$LIBS $GNUTLS_LIBS" | 1544 | LIBS="$LIBS $GNUTLS_LIBS" |
1547 | AC_MSG_CHECKING([[whether GnuTLS is usable]]) | 1545 | AC_MSG_CHECKING([[whether GnuTLS is usable]]) |
1548 | AC_LINK_IFELSE([ | 1546 | AC_LINK_IFELSE([ |
@@ -1557,7 +1555,9 @@ choke me now | |||
1557 | [ | 1555 | [ |
1558 | AC_MSG_RESULT([[yes]]) | 1556 | AC_MSG_RESULT([[yes]]) |
1559 | have_gnutls=yes | 1557 | have_gnutls=yes |
1558 | # GNUTLS_CFLAGS is actually CPPFLAGS | ||
1560 | GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS" | 1559 | GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS" |
1560 | # GNUTLS_CFLAGS is combination of LDFLAGS and LIBS | ||
1561 | GNUTLS_LDFLAGS="$GNUTLS_LIBS" | 1561 | GNUTLS_LDFLAGS="$GNUTLS_LIBS" |
1562 | ], | 1562 | ], |
1563 | [ | 1563 | [ |
@@ -1639,9 +1639,9 @@ AS_IF([test "x$have_gnutls" != "xyes" && test "x$with_gnutls" = "xyes"], [AC_MSG | |||
1639 | SAVE_CFLAGS="$CFLAGS" | 1639 | SAVE_CFLAGS="$CFLAGS" |
1640 | SAVE_LDFLAGS="$LDFLAGS" | 1640 | SAVE_LDFLAGS="$LDFLAGS" |
1641 | SAVE_LIBS="$LIBS" | 1641 | SAVE_LIBS="$LIBS" |
1642 | CPPFLAGS="$GNUTLS_CFLAGS $CPPFLAGS" | 1642 | CPPFLAGS="$GNUTLS_CPPFLAGS $CPPFLAGS" |
1643 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" | 1643 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" |
1644 | LDFLAGS="$GNUTLS_LIBS $LDFLAGS" | 1644 | LDFLAGS="$GNUTLS_LDFLAGS $LDFLAGS" |
1645 | LIBS="$LIBS $GNUTLS_LIBS" | 1645 | LIBS="$LIBS $GNUTLS_LIBS" |
1646 | AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]]) | 1646 | AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]]) |
1647 | AC_LINK_IFELSE([ | 1647 | AC_LINK_IFELSE([ |