You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

31 lines
1.3 KiB

  1. From 510d98157f21dee5793c4e975fde3317b6139267 Mon Sep 17 00:00:00 2001
  2. From: Daniel Stenberg <daniel@haxx.se>
  3. Date: Mon, 24 Aug 2020 16:28:34 +0200
  4. Subject: [PATCH] configure: fix pkg-config detecting wolfssl
  5. When amending the include path with "/wolfssl", this now properly strips
  6. off all whitespace from the path variable! Previously this would lead to
  7. pkg-config builds creating bad command lines.
  8. Closes #5848
  9. ---
  10. configure.ac | 8 ++++++--
  11. 1 file changed, 6 insertions(+), 2 deletions(-)
  12. --- a/configure.ac
  13. +++ b/configure.ac
  14. @@ -2474,8 +2474,12 @@ if test -z "$ssl_backends" -o "x$OPT_WOL
  15. AC_DEFINE(HAVE_WOLFSSL_DES_ECB_ENCRYPT, 1,
  16. [if you have wolfSSL_DES_ecb_encrypt])
  17. if test -n "$addcflags"; then
  18. - CPPFLAGS="$addcflags/wolfssl $CPPFLAGS"
  19. - AC_MSG_NOTICE([Add $addcflags/wolfssl to CPPFLAGS])
  20. + dnl use a for loop to strip off whitespace
  21. + for f in $addcflags; do
  22. + CPPFLAGS="$f/wolfssl $CPPFLAGS"
  23. + AC_MSG_NOTICE([Add $f/wolfssl to CPPFLAGS])
  24. + break
  25. + done
  26. else
  27. dnl user didn't give a path, so guess/hope they installed wolfssl
  28. dnl headers to system default location