apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1086600 - in /apr/apr/branches: 1.3.x/build/apr_hints.m4 1.4.x/build/apr_hints.m4 1.5.x/build/apr_hints.m4
Date Tue, 29 Mar 2011 14:37:37 GMT
Author: fuankg
Date: Tue Mar 29 14:37:37 2011
New Revision: 1086600

URL: http://svn.apache.org/viewvc?rev=1086600&view=rev
Log:
Backport some more configure magic from HEAD (r1083242).

Modified:
    apr/apr/branches/1.3.x/build/apr_hints.m4
    apr/apr/branches/1.4.x/build/apr_hints.m4
    apr/apr/branches/1.5.x/build/apr_hints.m4

Modified: apr/apr/branches/1.3.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/apr_hints.m4?rev=1086600&r1=1086599&r2=1086600&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.3.x/build/apr_hints.m4 Tue Mar 29 14:37:37 2011
@@ -440,17 +440,6 @@ dnl	       # Not a problem in 10.20.  Ot
 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
 	;;
     *mingw*)
-	dnl gcc (3.4.2 at least) seems to mis-optimize at levels greater than
-	dnl -O0 producing link-time errors.  The user can override by
-	dnl explicitly passing a CFLAGS value to configure.
-	dnl 
-	dnl Example error messages:
-	dnl undefined reference to 'libmsvcrt_a_iname'
-	dnl undefined reference to '_nm___pctype'
-	if test "$ac_test_CFLAGS" != set; then
-		APR_REMOVEFROM(CFLAGS,-O2)
-		APR_ADDTO(CFLAGS,-O0)
-	fi
         APR_ADDTO(CPPFLAGS, [-DWIN32])
         APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
         APR_SETIFNULL(have_unicode_fs, [1])
@@ -465,6 +454,18 @@ dnl	       # Not a problem in 10.20.  Ot
         APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
         APR_SETIFNULL(ac_cv_file__dev_zero, [no])
         APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+        case $host in
+            *mingw32*)
+                APR_SETIFNULL(apr_has_xthread_files, [1])
+                APR_SETIFNULL(apr_has_user, [1])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [1])
+                ;;
+            *mingwce)
+                APR_SETIFNULL(apr_has_xthread_files, [0])
+                APR_SETIFNULL(apr_has_user, [0])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [0])
+                ;;
+        esac
         ;;
   esac
 

Modified: apr/apr/branches/1.4.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_hints.m4?rev=1086600&r1=1086599&r2=1086600&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_hints.m4 Tue Mar 29 14:37:37 2011
@@ -442,17 +442,6 @@ dnl	       # Not a problem in 10.20.  Ot
 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
 	;;
     *mingw*)
-	dnl gcc (3.4.2 at least) seems to mis-optimize at levels greater than
-	dnl -O0 producing link-time errors.  The user can override by
-	dnl explicitly passing a CFLAGS value to configure.
-	dnl 
-	dnl Example error messages:
-	dnl undefined reference to 'libmsvcrt_a_iname'
-	dnl undefined reference to '_nm___pctype'
-	if test "$ac_test_CFLAGS" != set; then
-		APR_REMOVEFROM(CFLAGS,-O2)
-		APR_ADDTO(CFLAGS,-O0)
-	fi
         APR_ADDTO(CPPFLAGS, [-DWIN32])
         APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
         APR_SETIFNULL(have_unicode_fs, [1])
@@ -467,6 +456,18 @@ dnl	       # Not a problem in 10.20.  Ot
         APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
         APR_SETIFNULL(ac_cv_file__dev_zero, [no])
         APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+        case $host in
+            *mingw32*)
+                APR_SETIFNULL(apr_has_xthread_files, [1])
+                APR_SETIFNULL(apr_has_user, [1])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [1])
+                ;;
+            *mingwce)
+                APR_SETIFNULL(apr_has_xthread_files, [0])
+                APR_SETIFNULL(apr_has_user, [0])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [0])
+                ;;
+        esac
         ;;
   esac
 

Modified: apr/apr/branches/1.5.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/apr_hints.m4?rev=1086600&r1=1086599&r2=1086600&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.5.x/build/apr_hints.m4 Tue Mar 29 14:37:37 2011
@@ -442,17 +442,6 @@ dnl	       # Not a problem in 10.20.  Ot
 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
 	;;
     *mingw*)
-	dnl gcc (3.4.2 at least) seems to mis-optimize at levels greater than
-	dnl -O0 producing link-time errors.  The user can override by
-	dnl explicitly passing a CFLAGS value to configure.
-	dnl 
-	dnl Example error messages:
-	dnl undefined reference to 'libmsvcrt_a_iname'
-	dnl undefined reference to '_nm___pctype'
-	if test "$ac_test_CFLAGS" != set; then
-		APR_REMOVEFROM(CFLAGS,-O2)
-		APR_ADDTO(CFLAGS,-O0)
-	fi
         APR_ADDTO(CPPFLAGS, [-DWIN32])
         APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
         APR_SETIFNULL(have_unicode_fs, [1])
@@ -467,6 +456,18 @@ dnl	       # Not a problem in 10.20.  Ot
         APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
         APR_SETIFNULL(ac_cv_file__dev_zero, [no])
         APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+        case $host in
+            *mingw32*)
+                APR_SETIFNULL(apr_has_xthread_files, [1])
+                APR_SETIFNULL(apr_has_user, [1])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [1])
+                ;;
+            *mingwce)
+                APR_SETIFNULL(apr_has_xthread_files, [0])
+                APR_SETIFNULL(apr_has_user, [0])
+                APR_SETIFNULL(apr_procattr_user_set_requires_password, [0])
+                ;;
+        esac
         ;;
   esac
 



Mime
View raw message