svn commit: r719470 - /apr/apr-util/branches/1.3.x/build/dso.m4

[wr...@apache.org]

Author: wrowe
Date: Thu Nov 20 20:09:40 2008
New Revision: 719470

URL: http://svn.apache.org/viewvc?rev=719470&view=rev
Log:
Avert setting APU_DSO_BUILD if APR_HAS_DSO is false.

Backports: 719466, 719469

Modified:
    apr/apr-util/branches/1.3.x/build/dso.m4

Modified: apr/apr-util/branches/1.3.x/build/dso.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dso.m4?rev=719470&r1=719469&r2=719470&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dso.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dso.m4 Thu Nov 20 20:09:40 2008
@@ -24,7 +24,10 @@
      APR_HELP_STRING([--disable-util-dso],
        [disable DSO build of modular components (dbd, ldap)]))
 
-  if test "$enable_util_dso" = "no"; then
+  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
      # Statically link the DBD drivers:
 
      objs=