diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-08-13 20:21:03 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-08-13 20:21:03 +0000 |
| commit | 6b4efb0122ffc04014f27b1bb0f7863f909503cf (patch) | |
| tree | 121a82dde2e33148763bd69b44ac84b75c36b636 | |
| parent | 145c09f3ded1036f31ddf2ce28b8ef133860deb0 (diff) | |
| download | libapr-util-6b4efb0122ffc04014f27b1bb0f7863f909503cf.tar.gz | |
Follow up to r1372546:
Handle static-only apr/apr-util by adding -DAPU_DECLARE_STATIC
when necessary.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1372580 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 606a9b03..d7f0faaf 100644 --- a/configure.in +++ b/configure.in @@ -225,8 +225,19 @@ fi dnl dnl MinGW: If APR is shared, APR_DECLARE_EXPORT will be defined in the dnl internal CPPFLAGS, but APR-Util needs APU_DECLARE_EXPORT instead. +dnl If APR is static, APR_DECLARE_STATIC will be defined in the +dnl internal CPPFLAGS, but APR-Util needs APU_DECLARE_STATIC too. dnl -sed -e 's/-DAPR_DECLARE_EXPORT/-DAPU_DECLARE_EXPORT/' < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk +case $host in + *-mingw*) + sed -e 's/-DAPR_DECLARE_EXPORT/-DAPU_DECLARE_EXPORT/' \ + -e 's/-DAPR_DECLARE_STATIC/-DAPU_DECLARE_STATIC -DAPR_DECLARE_STATIC/' \ + < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk + ;; + *) + cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk + ;; +esac dnl dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles |