diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 06:13:58 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 06:13:58 +0000 |
| commit | 9cf4a8a7b31e63cc5093f74703a4214fede2e1f6 (patch) | |
| tree | c484bec74d8d697381364bccabc48b705ee153fb | |
| parent | 8ef47591d5d6d0ba1bf4355a7977903d8f5fda10 (diff) | |
| download | libapr-util-9cf4a8a7b31e63cc5093f74703a4214fede2e1f6.tar.gz | |
Ensure APU_DSO_BUILD on Unix is always defined, and binary [0 or 1]
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719495 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/dso.m4 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/build/dso.m4 b/build/dso.m4 index 90bf49ae..0e9efc7e 100644 --- a/build/dso.m4 +++ b/build/dso.m4 @@ -24,12 +24,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [ APR_HELP_STRING([--disable-util-dso], [disable DSO build of modular components (crypto, dbd, ldap)])) - apr_h=`$apr_config --includedir`/apr.h - aprdso=`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h` + if test "$enable_util_dso" = "no"; then + apu_dso_build="0" + else + apr_h="`$apr_config --includedir`/apr.h" + apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`" + fi - if test "$enable_util_dso" = "no" || "$aprdso" = "0"; then - # Statically link the DBD drivers: + if test "$apu_dso_build" = "0"; then + # 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" @@ -65,9 +69,10 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [ 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_ldap" + else - AC_DEFINE([APU_DSO_BUILD], 1, [Define if modular components are built as DSOs]) - + + # 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" @@ -83,5 +88,9 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [ if test -n "$dsos"; then APU_MODULES="$APU_MODULES $dsos" fi + fi + + AC_DEFINE_UNQUOTED([APU_DSO_BUILD], $apu_dso_build, + [Define to 1 if modular components are built as DSOs]) ]) |