svn commit: r1086714 - /apr/apr/branches/1.4.x/configure.in

[tr...@apache.org]

Author: trawick
Date: Tue Mar 29 20:13:37 2011
New Revision: 1086714

URL: http://svn.apache.org/viewvc?rev=1086714&view=rev
Log:
from trunk:
  r892122 (subset)  comment out the whacking of apr_private.h for mingw
  r1086666          axe that and some other commented-out mingw logic

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=1086714&r1=1086713&r2=1086714&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Tue Mar 29 20:13:37 2011
@@ -669,8 +669,6 @@ dnl without the extra " " in that case, 
 dnl end up LIBS="-lm -lcrypt -lnsl  -ldl" which is an annoyance.
 case $host in
    *mingw*)
-      dnl APR_ADDTO(LIBS,[-lmsvcrt --lshell32 -ladvapi32 -lws2_32])
-
       AC_CHECK_LIB(msvcrt, getpid)
       APR_CHECK_DLL_FUNC(kernel32, SetErrorMode@4)
       APR_CHECK_DLL_FUNC(advapi32, GetSecurityInfo@32)
@@ -2785,15 +2783,6 @@ for i in $APR_SAVE_HEADERS; do
   rm -f $i.save
 done
 chmod +x apr-$APR_MAJOR_VERSION-config
-# for mingw builds, we currently won't allow the unix apr_private.h to exist.
-# instead, we will rely on the manually-crafted win32 apr_private.h instead.
-case $APR_PLATFORM in
-    *-mingw*)
-        rm include/arch/unix/apr_private.h
-        ;;
-    *)
-        ;;
-esac
 ],[
 dnl This section is expanded by configure UNQUOTED so variable 
 dnl references must be backslash-escaped as necessary.