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 2008/08/15 23:45:45 UTC
svn commit: r686379 - /apr/apr-util/trunk/test/Makefile.win
Author: wrowe
Date: Fri Aug 15 14:45:45 2008
New Revision: 686379
URL: http://svn.apache.org/viewvc?rev=686379&view=rev
Log:
Static builds require linking against odbc still
Modified:
apr/apr-util/trunk/test/Makefile.win
Modified: apr/apr-util/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.win?rev=686379&r1=686378&r2=686379&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.win (original)
+++ apr/apr-util/trunk/test/Makefile.win Fri Aug 15 14:45:45 2008
@@ -89,11 +89,14 @@
$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
..\$(OUTDIR)\aprutil-1.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
+STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
!ELSE
PROGRAM_DEPENDENCIES = \
$(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
..\$(OUTDIR)\libaprutil-1.lib
-STATIC_CFLAGS =
+STATIC_CFLAGS =
+# APR 1.3 doesn't fully abstract ldap_ calls to permit switching providers;
+STATIC_LIBS = wldap32.lib
!ENDIF
!IFDEF _DEBUG
@@ -109,7 +112,7 @@
/D _DEBUG /D WIN32 /Fo"$(INTDIR)/" /FD
LD_LIBS = kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \
- ole32.lib shell32.lib rpcrt4.lib wldap32.lib
+ ole32.lib shell32.lib rpcrt4.lib $(STATIC_LIBS)
LDFLAGS = /nologo /debug /subsystem:console /incremental:no
SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no