diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-29 14:37:37 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-29 14:37:37 +0000 |
| commit | 3d9bdb7e4c866b7484f4b169f6090534ceee1c5a (patch) | |
| tree | d9f60c84242de7f2a2b78380bb21cb5c97d5221a | |
| parent | f3c4053057406d416aa9eeb985fdb35c33183106 (diff) | |
| download | apr-3d9bdb7e4c866b7484f4b169f6090534ceee1c5a.tar.gz | |
Backport some more configure magic from HEAD (r1083242).
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@1086600 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/apr_hints.m4 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index 667a9e70a..cd79a1359 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -440,17 +440,6 @@ dnl # Not a problem in 10.20. Otherwise, who knows? 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. Otherwise, who knows? 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 |