diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 04:03:54 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 04:03:54 +0000 |
| commit | d5ff454bdaa5c6d032c376b036f455db4215a2ec (patch) | |
| tree | 7c9e4a4bf80cbdb313c34f041992f5a7b5ab245a | |
| parent | 4098250eb5268e749c1343066ecfb73beba71a94 (diff) | |
| download | libapr-util-d5ff454bdaa5c6d032c376b036f455db4215a2ec.tar.gz | |
Avert setting APU_DSO_BUILD if APR_HAS_DSO is false.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719466 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/dso.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/dso.m4 b/build/dso.m4 index 0b77b7a9..701ee855 100644 --- a/build/dso.m4 +++ b/build/dso.m4 @@ -24,8 +24,10 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [ APR_HELP_STRING([--disable-util-dso], [disable DSO build of modular components (crypto, dbd, ldap)])) - if test "$enable_util_dso" = "no"; then - # Statically link the DBD drivers: + apr_h=`$apr_config --includedir`/apr.h + aprdso=`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h` + + if test "$enable_util_dso" = "no" || "$aprdso" = "0"; then objs= test $apu_have_openssl = 1 && objs="$objs crypto/apr_crypto_openssl.lo" |