apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r551983 - in /apr/apr-util/branches/1.2.x: NWGNUmakefile dbd/apr_dbd.c include/apu.hnw
Date Fri, 29 Jun 2007 18:08:58 GMT
Author: fuankg
Date: Fri Jun 29 11:08:58 2007
New Revision: 551983

URL: http://svn.apache.org/viewvc?view=rev&rev=551983
Log:
enabled DSO driver for NetWare.

Modified:
    apr/apr-util/branches/1.2.x/NWGNUmakefile
    apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
    apr/apr-util/branches/1.2.x/include/apu.hnw

Modified: apr/apr-util/branches/1.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/NWGNUmakefile?view=diff&rev=551983&r1=551982&r2=551983
==============================================================================
--- apr/apr-util/branches/1.2.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.2.x/NWGNUmakefile Fri Jun 29 11:08:58 2007
@@ -7,6 +7,12 @@
 	xml \
 	$(EOLIST) 
 
+ifdef WITH_APR_DBD
+SUBDIRS += \
+	dbd \
+	$(EOLIST) 
+endif
+
 #
 # Get the 'head' of the build environment.  This includes default targets and
 # paths to tools
@@ -240,7 +246,6 @@
 	$(OBJDIR)/apr_date.o \
 	$(OBJDIR)/apr_dbm.o \
 	$(OBJDIR)/apr_dbd.o \
-	$(OBJDIR)/apr_dbd_pgsql.o \
 	$(OBJDIR)/apr_dbm_berkeleydb.o \
 	$(OBJDIR)/apr_dbm_sdbm.o \
 	$(OBJDIR)/apr_hooks.o \

Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbd/apr_dbd.c?view=diff&rev=551983&r1=551982&r2=551983
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd.c Fri Jun 29 11:08:58 2007
@@ -126,6 +126,8 @@
 
 #ifdef WIN32
     sprintf(path, "apr_dbd_%s.dll", name);
+#elif defined(NETWARE)
+    sprintf(path, "dbd%s.nlm", name);
 #else
     sprintf(path, "apr_dbd_%s.so", name);
 #endif

Modified: apr/apr-util/branches/1.2.x/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apu.hnw?view=diff&rev=551983&r1=551982&r2=551983
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apu.hnw (original)
+++ apr/apr-util/branches/1.2.x/include/apu.hnw Fri Jun 29 11:08:58 2007
@@ -80,5 +80,10 @@
 #define APU_HAVE_ICONV         1
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
+/* 
+ * Hack to enable dynamic loads within apr_dbd
+ */
+#define APR_DSO_BUILD APR_HAS_DSO
+
 #endif /* APU_H */
 /** @} */



Mime
View raw message