from trunk:

  r892122 (subset)  comment out the whacking of apr_private.h for mingw
  r1086666          axe that and some other commented-out mingw logic


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1086714 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 11 deletions

diff --git a/configure.in b/configure.in
index 3083728e8..d0fc058bd 100644
--- a/configure.in
+++ b/configure.in
@@ -669,8 +669,6 @@ 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*)
-      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.