Does it make sense to favor the lib/ over the lib64/ installation of this pkg? Is this consistent across all directory choices?
It seems we are missing a level of abstraction and failing to utilize AC stock tools themselves... see my recent trunk/ work around PCRE for a significant simplification/refactoring (not arguing I was correct, actually asking for more eyeballs.) On Wed, Jun 27, 2018 at 7:15 AM, <jfcl...@apache.org> wrote: > Author: jfclere > Date: Wed Jun 27 12:15:32 2018 > New Revision: 1834497 > > URL: http://svn.apache.org/viewvc?rev=1834497&view=rev > Log: > Allow openssl.pc to be in lib64 (like other components). > > Modified: > httpd/httpd/trunk/acinclude.m4 > > Modified: httpd/httpd/trunk/acinclude.m4 > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude. > m4?rev=1834497&r1=1834496&r2=1834497&view=diff > ============================================================ > ================== > --- httpd/httpd/trunk/acinclude.m4 (original) > +++ httpd/httpd/trunk/acinclude.m4 Wed Jun 27 12:15:32 2018 > @@ -542,12 +542,18 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ > dnl Before doing anything else, load in pkg-config variables > if test -n "$PKGCONFIG"; then > saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" > - if test "x$ap_openssl_base" != "x" -a \ > - -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then > - dnl Ensure that the given path is used by pkg-config too, > otherwise > - dnl the system openssl.pc might be picked up instead. > - PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_ > CONFIG_PATH+:}${PKG_CONFIG_PATH}" > - export PKG_CONFIG_PATH > + if test "x$ap_openssl_base" != "x"; then > + if test -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then > + dnl Ensure that the given path is used by pkg-config too, > otherwise > + dnl the system openssl.pc might be picked up instead. > + PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_ > CONFIG_PATH+:}${PKG_CONFIG_PATH}" > + export PKG_CONFIG_PATH > + elif test -f "${ap_openssl_base}/lib64/pkgconfig/openssl.pc"; > then > + dnl Ensure that the given path is used by pkg-config too, > otherwise > + dnl the system openssl.pc might be picked up instead. > + PKG_CONFIG_PATH="${ap_openssl_base}/lib64/pkgconfig${PKG_ > CONFIG_PATH+:}${PKG_CONFIG_PATH}" > + export PKG_CONFIG_PATH > + fi > fi > AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(-- > enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's > static libraries (as indicated by "pkg-config --static"). Must be specified > in addition to --enable-ssl.]), [ > if test "$enableval" = "yes"; then > > >
