- saved_CPPFLAGS=$CPPFLAGS
- if test "x$ap_ssltk_base" != "x"; then
- ap_ssltk_inc="-I$ap_ssltk_base/include"
- CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
- # Ensure that the given path is used by pkg-config too, otherwise
- # the system openssl.pc might be picked up instead.
- PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
- export PKG_CONFIG_PATH
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ saved_LDFLAGS="$LDFLAGS"
+ SSL_LIBS=""
+
+ dnl Before doing anything else, load in pkg-config variables (if not sslc).
+ if test "x$ap_ssltk_type" = "x" -a -n "$PKGCONFIG"; then
+ saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+ if test "x$ap_ssltk_base" != "x" -a \
+ -f "${ap_ssltk_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_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+ export PKG_CONFIG_PATH
+ fi
+ ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
+ if test $? -eq 0; then
+ ap_ssltk_found="yes"
+ pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
+ APR_ADDTO(CPPFLAGS, [$pkglookup])
+ APR_ADDTO(INCLUDES, [$pkglookup])
+ pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
+ APR_ADDTO(LDFLAGS, [$pkglookup])
+ APR_ADDTO(SSL_LIBS, [$pkglookup])
+ fi
+ PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
+ fi
+ if test "x$ap_ssltk_base" != "x" -a "x$ap_ssltk_found" = "x"; then
+ APR_ADDTO(CPPFLAGS, [-I$ap_ssltk_base/include])
+ APR_ADDTO(INCLUDES, [-I$ap_ssltk_base/include])
+ APR_ADDTO(LDFLAGS, [-L$ap_ssltk_base/lib])
+ APR_ADDTO(SSL_LIBS, [-L$ap_ssltk_base/lib])
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+ APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
+ APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
+ fi