You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2007/01/03 13:31:08 UTC
svn commit: r492119 - /tcl/websh/trunk/src/win/Makefile
Author: ronnie
Date: Wed Jan 3 04:31:08 2007
New Revision: 492119
URL: http://svn.apache.org/viewvc?view=rev&rev=492119
Log:
- Apache 2.2 compatibility: reference libapr-1.lib not libapr.lib if needed
Modified:
tcl/websh/trunk/src/win/Makefile
Modified: tcl/websh/trunk/src/win/Makefile
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/win/Makefile?view=diff&rev=492119&r1=492118&r2=492119
==============================================================================
--- tcl/websh/trunk/src/win/Makefile (original)
+++ tcl/websh/trunk/src/win/Makefile Wed Jan 3 04:31:08 2007
@@ -141,8 +141,15 @@
HTTPD_INCLUDES = "$(HTTPD_PREFIX)/include"
!IF EXIST("$(HTTPD_PREFIX)/include/apr_strings.h")
# Apache 2
+!IF EXIST("$(HTTPD_PREFIX)/lib/libapr.lib")
+# Apache 2.0
HTTPD_LIBS = "$(HTTPD_PREFIX)/lib/libhttpd.lib" \
"$(HTTPD_PREFIX)/lib/libapr.lib"
+!ELSE
+# Apache 2.2
+HTTPD_LIBS = "$(HTTPD_PREFIX)/lib/libhttpd.lib" \
+ "$(HTTPD_PREFIX)/lib/libapr-1.lib"
+!ENDIF
!ELSE
# Apache 1.3
HTTPD_LIBS = "$(HTTPD_PREFIX)/lib/ap.lib" \
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org