svn commit: r892122 - /apr/apr/trunk/configure.in

[wr...@apache.org]

Author: wrowe
Date: Fri Dec 18 03:44:59 2009
New Revision: 892122

URL: http://svn.apache.org/viewvc?rev=892122&view=rev
Log:
working through various mingw elections, to straighten out win32 apr_private.h

Modified:
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=892122&r1=892121&r2=892122&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri Dec 18 03:44:59 2009
@@ -494,12 +494,13 @@
        OSDIR="as400"
        eolstr="\\n"
        ;;
-   *mingw*)
+   *-mingw*)
        OSDIR="win32"
        APR_ADDTO(CPPFLAGS,-DWIN32)
        ac_cv_file__dev_zero="no"
        ac_cv_func_setpgrp_void="no"
        apr_cv_tcp_nodelay_with_cork="no"
+       apr_cv_use_lfs64="no"
        enable_threads="system_threads"
        eolstr="\\r\\n"
        file_as_socket="0"
@@ -626,7 +627,7 @@
 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*)
+   *-mingw*)
       dnl APR_ADDTO(LIBS,[-lmsvcrt --lshell32 -ladvapi32 -lws2_32])
 
       AC_CHECK_LIB(msvcrt, getpid)
@@ -1527,6 +1528,16 @@
         esac
         size_t_fmt="lu"
         ;;
+    *-mingw*)
+dnl     int64_literal='#define APR_INT64_C(val) (val##i64)'
+dnl     uint64_literal='#define APR_UINT64_C(val) (val##Ui64)'
+        int64_t_fmt='#define APR_INT64_T_FMT "I64d"'
+        uint64_t_fmt='#define APR_UINT64_T_FMT "I64u"'
+        uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "I64x"'
+        int64_value="__int64"
+        long_value="__int64"
+        int64_strfn="_strtoi64"
+        ;;
 esac
 
 APR_CHECK_TYPES_COMPATIBLE(ssize_t, int, [ssize_t_fmt="d"])
@@ -1620,12 +1631,17 @@
             off_t_fmt='#define APR_OFF_T_FMT "lld"'
         fi
         ;;
+    *-mingw*)
+        off_t_value=apr_int64_t
+        off_t_fmt='#define APR_OFF_T_FMT "I64d"'
+        off_t_strfn='_strtoi64'
+        ;;
     esac
 else
-   # Fallback on int
-   off_t_value=apr_int32_t
-   off_t_fmt=d
-   off_t_strfn='strtoi'
+    # Fallback on int
+    off_t_value=apr_int64_t
+    off_t_fmt='#define APR_OFF_T_FMT "d"'
+    off_t_strfn='strtoi'
 fi
 AC_MSG_RESULT($off_t_value)
 
@@ -1746,7 +1762,7 @@
           if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
             dsotype=shl; APR_ADDTO(LIBS,-ldld)
           fi;;
-        *mingw*|*-os2*)
+        *-mingw*|*-os2*)
           # several 'other's below probably belong up here.  If they always
           # use a platform implementation and shouldn't test the dlopen/dlfcn
           # features, then bring them up here.
@@ -2645,7 +2661,7 @@
 # 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
+dnl XXX rm include/arch/unix/apr_private.h
         ;;
     *)
         ;;