You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2009/12/22 00:30:55 UTC
svn commit: r893031 - in /apr/apr/trunk: include/apr_ldap.hw
test/Makefile.win
Author: wrowe
Date: Mon Dec 21 23:30:55 2009
New Revision: 893031
URL: http://svn.apache.org/viewvc?rev=893031&view=rev
Log:
Get the tests compiling, with expat libs
Modified:
apr/apr/trunk/include/apr_ldap.hw
apr/apr/trunk/test/Makefile.win
Modified: apr/apr/trunk/include/apr_ldap.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_ldap.hw?rev=893031&r1=893030&r2=893031&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_ldap.hw (original)
+++ apr/apr/trunk/include/apr_ldap.hw Mon Dec 21 23:30:55 2009
@@ -31,7 +31,7 @@
*/
/* this will be defined if LDAP support was compiled into apr-util */
-#define APR_HAS_LDAP 1
+#define APR_HAS_LDAP 0
/* identify the LDAP toolkit used */
#define APR_HAS_NETSCAPE_LDAPSDK 0
Modified: apr/apr/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.win?rev=893031&r1=893030&r2=893031&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.win (original)
+++ apr/apr/trunk/test/Makefile.win Mon Dec 21 23:30:55 2009
@@ -127,7 +127,7 @@
$(INTDIR)\testsockets.obj \
$(INTDIR)\testsockopt.obj \
$(INTDIR)\teststr.obj \
- $(INTDIR)\testmatch.obj \
+ $(INTDIR)\teststrmatch.obj \
$(INTDIR)\teststrnatcmp.obj \
$(INTDIR)\testtable.obj \
$(INTDIR)\testtemp.obj \
@@ -164,8 +164,8 @@
LD = link.exe
!IF "$(MODEL)" == "static"
-LOCAL_LIB= ..\$(OUTDIR)\apr-2.lib
-APP_LIB= ..\$(OUTDIR)\aprapp-2.lib
+LOCAL_LIB= ..\$(OUTDIR)\apr-2.lib ..\..\expat\win32\bin\Release\libexpatMT.lib
+APP_LIB= ..\$(OUTDIR)\aprapp-2.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC
!ELSE
LOCAL_LIB= ..\$(OUTDIR)\libapr-2.lib
@@ -188,7 +188,8 @@
LD_LIBS = kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \
ole32.lib shell32.lib rpcrt4.lib
-LDFLAGS = /nologo /debug /subsystem:console /incremental:no
+LDFLAGS = /nologo /debug /subsystem:console /incremental:no /nodefaultlib:libcmt
+
SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no
.c{$(INTDIR)}.obj::