diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-04-11 19:58:38 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-04-11 19:58:38 +0000 |
| commit | 8e22c81f2c2baf74beaf4ff4e3dd28131eeeb149 (patch) | |
| tree | 8b6aacd98fd296efa5a6a0f6e0c42bb76cb8b238 | |
| parent | 1a75c0241d95156cc4c73da31c23632ea8fd88a7 (diff) | |
| download | libapr-8e22c81f2c2baf74beaf4ff4e3dd28131eeeb149.tar.gz | |
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>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1091188 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configure.in b/configure.in index ea4768dc2..9c20dd724 100644 --- a/configure.in +++ b/configure.in @@ -669,14 +669,8 @@ dnl without the extra " " in that case, but they didn't do that. So, we 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) |