You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/03/27 18:58:30 UTC
svn commit: r1085987 - in /apr/apr/branches: 1.3.x/build/apr_hints.m4
1.3.x/configure.in 1.4.x/build/apr_hints.m4 1.4.x/configure.in
1.5.x/build/apr_hints.m4 1.5.x/configure.in
Author: fuankg
Date: Sun Mar 27 16:58:30 2011
New Revision: 1085987
URL: http://svn.apache.org/viewvc?rev=1085987&view=rev
Log:
Moved platform-specific stuff to build/apr_hints.m4.
Modified:
apr/apr/branches/1.3.x/build/apr_hints.m4
apr/apr/branches/1.3.x/configure.in
apr/apr/branches/1.4.x/build/apr_hints.m4
apr/apr/branches/1.4.x/configure.in
apr/apr/branches/1.5.x/build/apr_hints.m4
apr/apr/branches/1.5.x/configure.in
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=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.3.x/build/apr_hints.m4 Sun Mar 27 16:58:30 2011
@@ -451,13 +451,21 @@ dnl # Not a problem in 10.20. Ot
APR_REMOVEFROM(CFLAGS,-O2)
APR_ADDTO(CFLAGS,-O0)
fi
- APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
- APR_SETIFNULL(apr_lock_method, [win32])
- APR_SETIFNULL(apr_process_lock_is_global, [yes])
- APR_SETIFNULL(have_unicode_fs, [1])
- APR_SETIFNULL(have_proc_invoked, [1])
- APR_SETIFNULL(apr_cv_use_lfs64, [yes])
- ;;
+ APR_ADDTO(CPPFLAGS, [-DWIN32])
+ APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
+ APR_SETIFNULL(have_unicode_fs, [1])
+ APR_SETIFNULL(have_proc_invoked, [1])
+ APR_SETIFNULL(apr_lock_method, [win32])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ APR_SETIFNULL(apr_cv_use_lfs64, [yes])
+ APR_SETIFNULL(apr_cv_osuuid, [yes])
+ APR_SETIFNULL(apr_cv_tcp_nodelay_with_cork, [no])
+ APR_SETIFNULL(apr_thread_func, [__stdcall])
+ APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
+ APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
+ APR_SETIFNULL(ac_cv_file__dev_zero, [no])
+ APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+ ;;
esac
fi
Modified: apr/apr/branches/1.3.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/configure.in?rev=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/configure.in (original)
+++ apr/apr/branches/1.3.x/configure.in Sun Mar 27 16:58:30 2011
@@ -482,17 +482,14 @@ case $host in
;;
*mingw*)
OSDIR="win32"
- ac_cv_file__dev_zero="no"
- ac_cv_func_setpgrp_void="no"
- apr_cv_tcp_nodelay_with_cork="no"
enable_threads="system_threads"
- eolstr="\\n"
+ eolstr="\\r\\n"
+ file_as_socket=0
proc_mutex_is_global=1
OBJECTS_PLATFORM='$(OBJECTS_win32)'
;;
*cygwin*)
OSDIR="unix"
- APR_ADDTO(CPPFLAGS,-DCYGWIN)
enable_threads="no"
eolstr="\\n"
;;
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=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_hints.m4 Sun Mar 27 16:58:30 2011
@@ -453,13 +453,21 @@ dnl # Not a problem in 10.20. Ot
APR_REMOVEFROM(CFLAGS,-O2)
APR_ADDTO(CFLAGS,-O0)
fi
- APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
- APR_SETIFNULL(apr_lock_method, [win32])
- APR_SETIFNULL(apr_process_lock_is_global, [yes])
- APR_SETIFNULL(have_unicode_fs, [1])
- APR_SETIFNULL(have_proc_invoked, [1])
- APR_SETIFNULL(apr_cv_use_lfs64, [yes])
- ;;
+ APR_ADDTO(CPPFLAGS, [-DWIN32])
+ APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
+ APR_SETIFNULL(have_unicode_fs, [1])
+ APR_SETIFNULL(have_proc_invoked, [1])
+ APR_SETIFNULL(apr_lock_method, [win32])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ APR_SETIFNULL(apr_cv_use_lfs64, [yes])
+ APR_SETIFNULL(apr_cv_osuuid, [yes])
+ APR_SETIFNULL(apr_cv_tcp_nodelay_with_cork, [no])
+ APR_SETIFNULL(apr_thread_func, [__stdcall])
+ APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
+ APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
+ APR_SETIFNULL(ac_cv_file__dev_zero, [no])
+ APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+ ;;
esac
fi
Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Sun Mar 27 16:58:30 2011
@@ -542,11 +542,7 @@ case $host in
eolstr="\\n"
;;
*mingw*)
- APR_ADDTO(CPPFLAGS,-DWIN32)
OSDIR="win32"
- ac_cv_file__dev_zero="no"
- ac_cv_func_setpgrp_void="no"
- apr_cv_tcp_nodelay_with_cork="no"
enable_threads="system_threads"
eolstr="\\r\\n"
file_as_socket=0
@@ -555,7 +551,6 @@ case $host in
;;
*cygwin*)
OSDIR="unix"
- APR_ADDTO(CPPFLAGS,-DCYGWIN)
enable_threads="no"
eolstr="\\n"
;;
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=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.5.x/build/apr_hints.m4 Sun Mar 27 16:58:30 2011
@@ -453,13 +453,21 @@ dnl # Not a problem in 10.20. Ot
APR_REMOVEFROM(CFLAGS,-O2)
APR_ADDTO(CFLAGS,-O0)
fi
- APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
- APR_SETIFNULL(apr_lock_method, [win32])
- APR_SETIFNULL(apr_process_lock_is_global, [yes])
- APR_SETIFNULL(have_unicode_fs, [1])
- APR_SETIFNULL(have_proc_invoked, [1])
- APR_SETIFNULL(apr_cv_use_lfs64, [yes])
- ;;
+ APR_ADDTO(CPPFLAGS, [-DWIN32])
+ APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
+ APR_SETIFNULL(have_unicode_fs, [1])
+ APR_SETIFNULL(have_proc_invoked, [1])
+ APR_SETIFNULL(apr_lock_method, [win32])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ APR_SETIFNULL(apr_cv_use_lfs64, [yes])
+ APR_SETIFNULL(apr_cv_osuuid, [yes])
+ APR_SETIFNULL(apr_cv_tcp_nodelay_with_cork, [no])
+ APR_SETIFNULL(apr_thread_func, [__stdcall])
+ APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
+ APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
+ APR_SETIFNULL(ac_cv_file__dev_zero, [no])
+ APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+ ;;
esac
fi
Modified: apr/apr/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/configure.in?rev=1085987&r1=1085986&r2=1085987&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/configure.in (original)
+++ apr/apr/branches/1.5.x/configure.in Sun Mar 27 16:58:30 2011
@@ -542,11 +542,7 @@ case $host in
eolstr="\\n"
;;
*mingw*)
- APR_ADDTO(CPPFLAGS,-DWIN32)
OSDIR="win32"
- ac_cv_file__dev_zero="no"
- ac_cv_func_setpgrp_void="no"
- apr_cv_tcp_nodelay_with_cork="no"
enable_threads="system_threads"
eolstr="\\r\\n"
file_as_socket=0
@@ -555,7 +551,6 @@ case $host in
;;
*cygwin*)
OSDIR="unix"
- APR_ADDTO(CPPFLAGS,-DCYGWIN)
enable_threads="no"
eolstr="\\n"
;;