diff options
Diffstat (limited to 'srclib/apr-util/build/dso.m4')
| -rw-r--r-- | srclib/apr-util/build/dso.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/srclib/apr-util/build/dso.m4 b/srclib/apr-util/build/dso.m4 index 4262337f..ec2f5c94 100644 --- a/srclib/apr-util/build/dso.m4 +++ b/srclib/apr-util/build/dso.m4 @@ -22,7 +22,7 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [ AC_ARG_ENABLE([util-dso], APR_HELP_STRING([--disable-util-dso], - [disable DSO build of modular components (dbd, dbm, ldap)])) + [disable DSO build of modular components (crypto, dbd, dbm, ldap)])) if test "$enable_util_dso" = "no"; then apu_dso_build="0" @@ -48,6 +48,8 @@ yes # Statically link the drivers: objs= + test $apu_have_openssl = 1 && objs="$objs crypto/apr_crypto_openssl.lo" + test $apu_have_nss = 1 && objs="$objs crypto/apr_crypto_nss.lo" test $apu_have_oracle = 1 && objs="$objs dbd/apr_dbd_oracle.lo" test $apu_have_pgsql = 1 && objs="$objs dbd/apr_dbd_pgsql.lo" test $apu_have_mysql = 1 && objs="$objs dbd/apr_dbd_mysql.lo" @@ -77,9 +79,11 @@ yes done fi + APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss" APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc" APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm" APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap" + APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss" APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc" APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm" APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap" @@ -88,6 +92,8 @@ yes # Build the drivers as loadable modules: dsos= + test $apu_have_openssl = 1 && dsos="$dsos crypto/apr_crypto_openssl.la" + test $apu_have_nss = 1 && dsos="$dsos crypto/apr_crypto_nss.la" test $apu_have_oracle = 1 && dsos="$dsos dbd/apr_dbd_oracle.la" test $apu_have_pgsql = 1 && dsos="$dsos dbd/apr_dbd_pgsql.la" test $apu_have_mysql = 1 && dsos="$dsos dbd/apr_dbd_mysql.la" |