0000-configure-ssl-library-path.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001
  2. From: Richard Mudgett <rmudgett@digium.com>
  3. Date: Mon, 6 Aug 2018 11:24:25 -0500
  4. Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch
  5. ---
  6. aconfigure | 6 +++++-
  7. aconfigure.ac | 6 +++++-
  8. 2 files changed, 10 insertions(+), 2 deletions(-)
  9. diff --git a/aconfigure b/aconfigure
  10. index 1c449b8..c4c6060 100755
  11. --- a/aconfigure
  12. +++ b/aconfigure
  13. @@ -7954,7 +7954,11 @@ else
  14. if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
  15. CFLAGS="$CFLAGS -I$with_ssl/include"
  16. CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
  17. - LDFLAGS="$LDFLAGS -L$with_ssl/lib"
  18. + if test -d $with_ssl/lib; then
  19. + LDFLAGS="$LDFLAGS -L$with_ssl/lib"
  20. + else
  21. + LDFLAGS="$LDFLAGS -L$with_ssl"
  22. + fi
  23. { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
  24. $as_echo "Using SSL prefix... $with_ssl" >&6; }
  25. fi
  26. diff --git a/aconfigure.ac b/aconfigure.ac
  27. index 2c272cd..a5d6d97 100644
  28. --- a/aconfigure.ac
  29. +++ b/aconfigure.ac
  30. @@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl,
  31. if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
  32. CFLAGS="$CFLAGS -I$with_ssl/include"
  33. CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
  34. - LDFLAGS="$LDFLAGS -L$with_ssl/lib"
  35. + if test -d $with_ssl/lib; then
  36. + LDFLAGS="$LDFLAGS -L$with_ssl/lib"
  37. + else
  38. + LDFLAGS="$LDFLAGS -L$with_ssl"
  39. + fi
  40. AC_MSG_RESULT([Using SSL prefix... $with_ssl])
  41. fi
  42. --
  43. 2.7.4