Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 37952 invoked from network); 11 Apr 2011 19:58:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Apr 2011 19:58:59 -0000 Received: (qmail 61075 invoked by uid 500); 11 Apr 2011 19:58:59 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 60983 invoked by uid 500); 11 Apr 2011 19:58:59 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 60976 invoked by uid 99); 11 Apr 2011 19:58:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 19:58:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 19:58:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EEDA42388A60; Mon, 11 Apr 2011 19:58:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1091188 - /apr/apr/branches/1.4.x/configure.in Date: Mon, 11 Apr 2011 19:58:38 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110411195838.EEDA42388A60@eris.apache.org> Author: trawick Date: Mon Apr 11 19:58:38 2011 New Revision: 1091188 URL: http://svn.apache.org/viewvc?rev=1091188&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 Modified: apr/apr/branches/1.4.x/configure.in Modified: apr/apr/branches/1.4.x/configure.in URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=1091188&r1=1091187&r2=1091188&view=diff ============================================================================== --- apr/apr/branches/1.4.x/configure.in (original) +++ apr/apr/branches/1.4.x/configure.in Mon Apr 11 19:58:38 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)