--- apr-util-1.6.0/build/apu-conf.m4.apr-link	2017-10-14 19:09:07.430275959 +0300
+++ apr-util-1.6.0/build/apu-conf.m4	2017-10-14 19:09:07.431275951 +0300
@@ -159,41 +159,41 @@
 CPPFLAGS=$save_cppflags
 LDFLAGS=$save_ldflags
 ])
 
 
 dnl 
 dnl Find a particular LDAP library
 dnl
 AC_DEFUN([APU_FIND_LDAPLIB], [
   if test ${apu_has_ldap} != "1"; then
     ldaplib=$1
     extralib=$2
     # Clear the cache entry for subsequent APU_FIND_LDAPLIB invocations.
     changequote(,)
     ldaplib_cache_id="`echo $ldaplib | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
     changequote([,])
     unset ac_cv_lib_${ldaplib_cache_id}_ldap_init
     unset ac_cv_lib_${ldaplib_cache_id}___ldap_init
     AC_CHECK_LIB(${ldaplib}, ldap_init, 
       [
-        LDADD_ldap_found="-l${ldaplib} ${extralib}"
+        LDADD_ldap_found="-l${ldaplib} ${extralib} $APR_LIBS"
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_init, apu_has_ldapssl_client_init="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, apu_has_ldapssl_client_deinit="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, apu_has_ldapssl_add_trusted_cert="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, apu_has_ldap_start_tls_s="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldap_sslinit, apu_has_ldap_sslinit="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_init, apu_has_ldapssl_init="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, apu_has_ldapssl_install_routines="1", , ${extralib})
         apu_has_ldap="1";
       ], , ${extralib})
   fi
 ])
 
 
 dnl
 dnl APU_FIND_LDAP: figure out where LDAP is located
 dnl
 AC_DEFUN([APU_FIND_LDAP],  [
 
 echo $ac_n "${nl}checking for ldap support..."
 
--- apr-util-1.6.0/build/crypto.m4.apr-link	2017-05-04 02:18:52.000000000 +0300
+++ apr-util-1.6.0/build/crypto.m4	2017-10-14 19:09:07.431275951 +0300
@@ -109,41 +109,41 @@
       AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
       if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
         apu_have_openssl=1
         APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
       fi
 
       AC_CHECK_DECLS([EVP_PKEY_CTX_new], [], [],
                      [#include <openssl/evp.h>])
 
     fi
   ], [
     apu_have_openssl=0
   ])
 
   AC_SUBST(apu_have_openssl)
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_openssl" = "1"; then
-    APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lssl -lcrypto])
+    APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lssl -lcrypto $APR_LIBS])
     apu_have_crypto=1
 
     AC_MSG_CHECKING([for const input buffers in OpenSSL])
     AC_TRY_COMPILE([#include <openssl/rsa.h>],
         [ const unsigned char * buf;
           unsigned char * outbuf;
           RSA rsa;
 
                 RSA_private_decrypt(1,
                                                         buf,
                                                         outbuf,
                                                         &rsa,
                                                         RSA_PKCS1_PADDING);
 
         ],
         [AC_MSG_RESULT([yes])]
         [AC_DEFINE([CRYPTO_OPENSSL_CONST_BUFFERS], 1, [Define that OpenSSL uses const buffers])],
         [AC_MSG_RESULT([no])])
 
   fi  
@@ -203,41 +203,41 @@
       AC_CHECK_HEADERS(nss/pk11pub.h pk11pub.h, [nss_have_pk11pubh=1])
       nss_have_headers=${nss_have_prerrorh}${nss_have_nssh}${nss_have_pk11pubh}
       AC_CHECK_LIB(nspr4, PR_Initialize, AC_CHECK_LIB(nss3, PK11_CreatePBEV2AlgorithmID, [nss_have_libs=1],,-lnspr4))
       if test "$nss_have_headers" = "111" && test "$nss_have_libs" != "0"; then
         apu_have_nss=1
       fi
 
     fi
     if test "$apu_have_nss" != "0"; then
       APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$nss_CPPFLAGS])
     fi
   ], [
     apu_have_nss=0
   ])
 
   AC_SUBST(apu_have_nss)
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_nss" = "1"; then
-    APR_ADDTO(LDADD_crypto_nss, [$nss_LDFLAGS -lnspr4 -lnss3])
+    APR_ADDTO(LDADD_crypto_nss, [$nss_LDFLAGS -lnspr4 -lnss3 $APR_LIBS])
     apu_have_crypto=1
   fi
   AC_SUBST(LDADD_crypto_nss)
   AC_SUBST(apu_have_crypto)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
   LDFLAGS="$old_ldflags"
 ])
 
 AC_DEFUN([APU_CHECK_CRYPTO_COMMONCRYPTO], [
   apu_have_commoncrypto=0
   commoncrypto_have_headers=0
   commoncrypto_have_libs=0
 
   old_libs="$LIBS"
   old_cppflags="$CPPFLAGS"
   old_ldflags="$LDFLAGS"
 
   AC_ARG_WITH([commoncrypto], 
--- apr-util-1.6.0/build/dbd.m4.apr-link	2017-05-04 02:18:52.000000000 +0300
+++ apr-util-1.6.0/build/dbd.m4	2017-10-14 19:11:17.872194837 +0300
@@ -130,41 +130,41 @@
     if test "$apu_have_pgsql" = "0"; then
       AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
         if test "x$PGSQL_CONFIG" != 'x'; then
           unset ac_cv_lib_pq_PQsendQueryPrepared
           pgsql_LIBS="`$PGSQL_CONFIG --libs`"
           APR_ADDTO(LIBS, [$pgsql_LIBS])
           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
         fi
         ])
       ])
     fi
     if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
       APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
     fi
   ])
   AC_SUBST(apu_have_pgsql)
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_pgsql" = "1"; then
-    APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS])
+    APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS $APR_LIBS])
   fi
   AC_SUBST(LDADD_dbd_pgsql)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
   LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_MYSQL], [
   apu_have_mysql=0
 
   old_libs="$LIBS"
   old_cppflags="$CPPFLAGS"
   old_ldflags="$LDFLAGS"
 
   my_library="mysqlclient"
 
   AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
   [
     if test "$withval" = "yes"; then
@@ -222,41 +222,41 @@
       AC_MSG_NOTICE(checking for mysql in $withval)
       AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
       if test "$apr_have_mysql" = "0"; then
         AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
       fi
       if test "$apr_have_mysql" = "1"; then
         AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
         AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
       fi
       if test "$apu_have_mysql" = "1"; then
         APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
       fi
     fi
   ])
 
   AC_SUBST(apu_have_mysql)
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_mysql" = "1"; then
-    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS])
+    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS $APR_LIBS])
   fi
   AC_SUBST(LDADD_dbd_mysql)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
   LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_SQLITE3], [
   apu_have_sqlite3=0
 
   old_libs="$LIBS"
   old_cppflags="$CPPFLAGS"
   old_ldflags="$LDFLAGS"
 
   AC_ARG_WITH([sqlite3], APR_HELP_STRING([--with-sqlite3=DIR], [enable sqlite3 DBD driver]),
   [
     if test "$withval" = "yes"; then
       AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
     elif test "$withval" = "no"; then
@@ -266,41 +266,41 @@
       sqlite3_LDFLAGS="-L$withval/lib "
 
       APR_ADDTO(CPPFLAGS, [$sqlite3_CPPFLAGS])
       APR_ADDTO(LDFLAGS, [$sqlite3_LDFLAGS])
 
       AC_MSG_NOTICE(checking for sqlite3 in $withval)
       AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
       if test "$apu_have_sqlite3" != "0"; then
         APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
       fi
     fi
   ], [
     AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
   ])
 
   AC_SUBST(apu_have_sqlite3)
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_sqlite3" = "1"; then
-    APR_ADDTO(LDADD_dbd_sqlite3, [$sqlite3_LDFLAGS -lsqlite3])
+    APR_ADDTO(LDADD_dbd_sqlite3, [$sqlite3_LDFLAGS -lsqlite3 $APR_LIBS])
   fi
   AC_SUBST(LDADD_dbd_sqlite3)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
   LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_SQLITE2], [
   apu_have_sqlite2=0
 
   old_libs="$LIBS"
   old_cppflags="$CPPFLAGS"
   old_ldflags="$LDFLAGS"
 
   AC_ARG_WITH([sqlite2], APR_HELP_STRING([--with-sqlite2=DIR], [enable sqlite2 DBD driver]),
   [
     if test "$withval" = "yes"; then
       AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
     elif test "$withval" = "no"; then
@@ -488,37 +488,37 @@
       odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`"
       odbc_LIBS="`$ODBC_CONFIG --libs`"
 
       APR_ADDTO(CPPFLAGS, [$odbc_CPPFLAGS])
       APR_ADDTO(LDFLAGS, [$odbc_LDFLAGS])
       APR_ADDTO(LIBS, [$odbc_LIBS])
     fi
 
     AC_CHECK_HEADERS(sql.h, AC_CHECK_LIB(odbc, SQLAllocHandle, [apu_have_odbc=1]))
     if test "$apu_have_odbc" = "0"; then
       AC_CHECK_HEADERS(odbc/sql.h, AC_CHECK_LIB(odbc, SQLAllocHandle, [apu_have_odbc=1]))
     fi
     if test "$apu_have_odbc" != "0" && test "x$ODBC_CONFIG" != 'x'; then
       APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$odbc_CPPFLAGS])
     fi
   ])
   AC_SUBST(apu_have_odbc)
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_odbc" = "1"; then
-    APR_ADDTO(LDADD_dbd_odbc, [$odbc_LDFLAGS -lodbc $odbc_LIBS])
+    APR_ADDTO(LDADD_dbd_odbc, [$odbc_LDFLAGS -lodbc $odbc_LIBS $APR_LIBS])
   fi
   AC_SUBST(LDADD_dbd_odbc)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
   LDFLAGS="$old_ldflags"
 
   apu_dbd_tests=""
   test $apu_have_oracle = 1 &&  apu_dbd_tests="$apu_dbd_tests oracle"
   test $apu_have_pgsql = 1 &&   apu_dbd_tests="$apu_dbd_tests pgsql"
   test $apu_have_mysql = 1 &&   apu_dbd_tests="$apu_dbd_tests mysql"
   test $apu_have_sqlite2 = 1 && apu_dbd_tests="$apu_dbd_tests sqlite2"
   test $apu_have_sqlite3 = 1 && apu_dbd_tests="$apu_dbd_tests sqlite3"
   test $apu_have_odbc = 1 &&    apu_dbd_tests="$apu_dbd_tests odbc"
   AC_SUBST(apu_dbd_tests)
 ])
--- apr-util-1.6.0/build/dbm.m4.apr-link	2017-05-04 02:18:52.000000000 +0300
+++ apr-util-1.6.0/build/dbm.m4	2017-10-14 19:09:07.431275951 +0300
@@ -705,41 +705,41 @@
 
   dnl Yes, it'd be nice if we could collate the output in an order
   dnl so that the AC_MSG_CHECKING would be output before the actual
   dnl checks, but it isn't happening now.
   AC_MSG_CHECKING(for default DBM)
   AC_MSG_RESULT($apu_default_dbm)
 
   AC_SUBST(apu_use_sdbm)
   AC_SUBST(apu_use_gdbm)
   AC_SUBST(apu_use_ndbm)
   AC_SUBST(apu_use_db)
 
   AC_SUBST(apu_have_sdbm)
   AC_SUBST(apu_have_gdbm)
   AC_SUBST(apu_have_ndbm)
   AC_SUBST(apu_have_db)
   AC_SUBST(apu_db_header)
   AC_SUBST(apu_db_version)
 
   if test "$apu_have_db" = "1"; then
-    APR_ADDTO(LDADD_dbm_db, [-l$apu_db_lib])
+    APR_ADDTO(LDADD_dbm_db, [-l$apu_db_lib $APR_LIBS])
     if test -n "apu_db_xtra_libs"; then
       APR_ADDTO(LDADD_dbm_db, [$apu_db_xtra_libs])
     fi
   fi
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_gdbm" = "1"; then
     APR_ADDTO(LDADD_dbm_gdbm, [-lgdbm])
   fi
 
   if test "$apu_have_ndbm" = "1"; then
     APR_ADDTO(LDADD_dbm_ndbm, [-l$apu_ndbm_lib])
   fi
 
   AC_SUBST(LDADD_dbm_db)
   AC_SUBST(LDADD_dbm_gdbm)
   AC_SUBST(LDADD_dbm_ndbm)
 ])