summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2008-05-23 17:04:11 +0000
committerbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2008-05-23 17:04:11 +0000
commita7dc702543f6800b51fe1bca3de22ffe491b4788 (patch)
tree01ae30ea202d13105c7b0fb888c1a3eab73aa5cc
parent27ec6fb83527a2638ed9f31a78dffe063c17eddb (diff)
downloadlibapr-util-a7dc702543f6800b51fe1bca3de22ffe491b4788.tar.gz
Turn off the APU DSO functionality so that NetWare continues to build as a single shared library
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@659597 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--NWGNUmakefile1
-rw-r--r--include/apu.hnw2
-rw-r--r--ldap/NWGNUmakefile1
3 files changed, 3 insertions, 1 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile
index 68a8733e..f5f9aa96 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -248,6 +248,7 @@ FILES_lib_objs = \
$(OBJDIR)/apr_dbd.o \
$(OBJDIR)/apr_dbm_berkeleydb.o \
$(OBJDIR)/apr_dbm_sdbm.o \
+ $(OBJDIR)/apu_dso.o \
$(OBJDIR)/apr_hooks.o \
$(OBJDIR)/apr_md4.o \
$(OBJDIR)/apr_md5.o \
diff --git a/include/apu.hnw b/include/apu.hnw
index bb5aa554..eef74fe7 100644
--- a/include/apu.hnw
+++ b/include/apu.hnw
@@ -83,7 +83,7 @@
/*
* we allways enable dynamic driver loads within apr_dbd
*/
-#define APU_DSO_BUILD 1
+#define APU_DSO_BUILD 0
#if !APU_DSO_BUILD
#define APU_HAVE_PGSQL 0
diff --git a/ldap/NWGNUmakefile b/ldap/NWGNUmakefile
index fd1964dd..3e8bbdad 100644
--- a/ldap/NWGNUmakefile
+++ b/ldap/NWGNUmakefile
@@ -27,6 +27,7 @@ XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
$(APRUTIL)/include \
+ $(APRUTIL)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)