Commit bddb33dd authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available. 

PR: 46018


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711993 13f79535-47bb-0310-9956-ffa450edef68
parent eeed0856

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

[ When backported to 2.2.x, remove entry from this file ]



  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is

     not available. PR 46018 [Ruediger Pluem]



  *) mod_expires: Do not sets negative max-age / Expires header in the past.

     PR 39774 [Jim Jagielski]

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -447,10 +447,10 @@ if test "x$ap_ssltk_configured" = "x"; then 
        pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"

        APR_ADDTO(LDFLAGS, [$pkglookup])

      else

        ap_ssltk_libs="-lssl -lcrypto"

        ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"

      fi

    else

      ap_ssltk_libs="-lssl -lcrypto"

      ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"

    fi

  fi

  APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs])