You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/04/11 21:57:33 UTC
svn commit: r1091186 - /apr/apr/branches/1.5.x/configure.in
Author: trawick
Date: Mon Apr 11 19:57:33 2011
New Revision: 1091186
URL: http://svn.apache.org/viewvc?rev=1091186&view=rev
Log:
Grab subset of trunk r1088023:
* Removed the "strange" libraries detection (btw, probably it was also breaking
platforms without __stdcall calling convention, like Windows CE/Mobile/Phone,
since function names were decorated), linker gave error without sense if adding
"-lkernel32", probably because it creates a conflict of library precedence and
dependency.
Submitted by: Carlo Bramini <carlo.bramix libero.it>
Modified:
apr/apr/branches/1.5.x/configure.in
Modified: apr/apr/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/configure.in?rev=1091186&r1=1091185&r2=1091186&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/configure.in (original)
+++ apr/apr/branches/1.5.x/configure.in Mon Apr 11 19:57:33 2011
@@ -669,14 +669,8 @@ dnl without the extra " " in that case,
dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.
case $host in
*mingw*)
- AC_CHECK_LIB(msvcrt, getpid)
- APR_CHECK_DLL_FUNC(kernel32, SetErrorMode@4)
- APR_CHECK_DLL_FUNC(advapi32, GetSecurityInfo@32)
- APR_CHECK_DLL_FUNC(ws2_32, gethostbyname@4)
- APR_CHECK_DLL_FUNC(shell32, CommandLineToArgvW@8)
- APR_CHECK_DLL_FUNC(kernel32,[CreateFileMappingA@24],
- [ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA])
- APR_CHECK_DLL_FUNC(rpcrt4,[UuidCreate@4])
+ APR_ADDTO(LIBS,[-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock])
+ ac_cv_func_CreateFileMapping=yes
;;
*)
AC_SEARCH_LIBS(gethostbyname, nsl)