apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r891846 - in /apr/apr/trunk: include/apu.h.in include/apu.hnw include/apu.hw include/private/apu_config.hw libapr.dsp
Date Thu, 17 Dec 2009 19:13:50 GMT
Author: wrowe
Date: Thu Dec 17 19:13:49 2009
New Revision: 891846

URL: http://svn.apache.org/viewvc?rev=891846&view=rev
Log:
The expat-way of doing things to the expat lib, rather than our own xml.lib

Modified:
    apr/apr/trunk/include/apu.h.in
    apr/apr/trunk/include/apu.hnw
    apr/apr/trunk/include/apu.hw
    apr/apr/trunk/include/private/apu_config.hw
    apr/apr/trunk/libapr.dsp

Modified: apr/apr/trunk/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.h.in?rev=891846&r1=891845&r2=891846&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.h.in (original)
+++ apr/apr/trunk/include/apu.h.in Thu Dec 17 19:13:49 2009
@@ -25,7 +25,6 @@
  * @{
  */
 
-
 #ifndef APU_H
 #define APU_H
 

Modified: apr/apr/trunk/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hnw?rev=891846&r1=891845&r2=891846&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.hnw (original)
+++ apr/apr/trunk/include/apu.hnw Thu Dec 17 19:13:49 2009
@@ -25,10 +25,6 @@
 #ifdef NETWARE
 #ifndef APU_H
 #define APU_H
-/**
- * @defgroup APR_Util APR Utility Functions
- * @{
- */
 
 /*
  * we always have SDBM (it's in our codebase)

Modified: apr/apr/trunk/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hw?rev=891846&r1=891845&r2=891846&view=diff
==============================================================================
--- apr/apr/trunk/include/apu.hw (original)
+++ apr/apr/trunk/include/apu.hw Thu Dec 17 19:13:49 2009
@@ -25,7 +25,6 @@
  * @{
  */
 
-
 #ifndef APU_H
 #define APU_H
 
@@ -46,7 +45,7 @@
 
 /* 
  * we always enable dynamic driver loads within apr_dbd
- * Win32 always has odbc (it's always installed)
+ * driver builds enable these flags individually
  */
 #ifndef APU_DSO_MODULE_BUILD
 #define APU_HAVE_PGSQL          0
@@ -55,7 +54,7 @@
 #define APU_HAVE_SQLITE2        0
 #define APU_HAVE_ORACLE         0
 #define APU_HAVE_FREETDS        0
-#define APU_HAVE_ODBC           1
+#define APU_HAVE_ODBC           0
 #endif
 
 #define APU_HAVE_CRYPTO         0

Modified: apr/apr/trunk/include/private/apu_config.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apu_config.hw?rev=891846&r1=891845&r2=891846&view=diff
==============================================================================
--- apr/apr/trunk/include/private/apu_config.hw (original)
+++ apr/apr/trunk/include/private/apu_config.hw Thu Dec 17 19:13:49 2009
@@ -24,9 +24,12 @@
 #ifndef APU_CONFIG_H
 #define APU_CONFIG_H
 
-/* Compile win32 with DSO support for .dll builds */
+/* Compile win32 with DSO support for .dll builds
+ * Pair the static xml build for static apr-2.lib
+ */
 #ifdef APR_DECLARE_STATIC
 #define APU_DSO_BUILD           0
+#define XML_STATIC              1
 #else
 #define APU_DSO_BUILD           1
 #endif
@@ -37,6 +40,9 @@
 /* my_sys.h is broken on VC/Win32, and apparently not required */
 /* #undef HAVE_MY_SYS_H           0 */
 
+/* Windows ODBC sql.h is always present */
+#define HAVE_SQL_H              1
+
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat
  */

Modified: apr/apr/trunk/libapr.dsp
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.dsp?rev=891846&r1=891845&r2=891846&view=diff
==============================================================================
--- apr/apr/trunk/libapr.dsp (original)
+++ apr/apr/trunk/libapr.dsp Thu Dec 17 19:13:49 2009
@@ -55,7 +55,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
expat.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/expat/bin/Release"
/out:"Release\libapr-2.dll" /pdb:"Release\libapr-2.pdb" /implib:"Release\libapr-2.lib" /MACHINE:X86
/opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
libexpat.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"..\expat\win32\bin\Release"
/out:"Release\libapr-2.dll" /pdb:"Release\libapr-2.pdb" /implib:"Release\libapr-2.lib" /MACHINE:X86
/opt:ref
 # Begin Special Build Tool
 TargetPath=Release\libapr-2.dll
 SOURCE="$(InputPath)"
@@ -87,7 +87,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/expat/bin/Debug"
/out:"Debug\libapr-2.dll" /pdb:"Debug\libapr-2.pdb" /implib:"Debug\libapr-2.lib" /MACHINE:X86
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
libexpat.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"..\expat\win32\bin\Debug"
/out:"Debug\libapr-2.dll" /pdb:"Debug\libapr-2.pdb" /implib:"Debug\libapr-2.lib" /MACHINE:X86
 # Begin Special Build Tool
 TargetPath=Debug\libapr-2.dll
 SOURCE="$(InputPath)"
@@ -119,7 +119,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/expat/bin/x64/Release"
/out:"x64\Release\libapr-2.dll" /pdb:"x64\Release\libapr-2.pdb" /implib:"x64\Release\libapr-2.lib"
/MACHINE:X64 /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
libexpat.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"..\expat\win32\bin\x64\Release"
/out:"x64\Release\libapr-2.dll" /pdb:"x64\Release\libapr-2.pdb" /implib:"x64\Release\libapr-2.lib"
/MACHINE:X64 /opt:ref
 # Begin Special Build Tool
 TargetPath=x64\Release\libapr-2.dll
 SOURCE="$(InputPath)"
@@ -151,7 +151,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/expat/bin/x64/Debug"
/out:"x64\Debug\libapr-2.dll" /pdb:"x64\Debug\libapr-2.pdb" /implib:"x64\Debug\libapr-2.lib"
/MACHINE:X64
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
libexpat.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /libpath:"..\expat\win32\bin\x64\Debug"
/out:"x64\Debug\libapr-2.dll" /pdb:"x64\Debug\libapr-2.pdb" /implib:"x64\Debug\libapr-2.lib"
/MACHINE:X64
 # Begin Special Build Tool
 TargetPath=x64\Debug\libapr-2.dll
 SOURCE="$(InputPath)"



Mime
View raw message