apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guenter Knauf <fua...@apache.org>
Subject Re: svn commit: r1085978 - in /apr/apr/trunk: build/apr_hints.m4 configure.in
Date Sun, 27 Mar 2011 16:26:56 GMT
Jeff,
can you please take a look at this commit and verify this is what you 
suggested, and that I did it right? If ok, should I proceed and apply 
all these to build/apr_hints.m4 across all branches?

Gün.

Am 27.03.2011 18:24, schrieb fuankg@apache.org:
> Author: fuankg
> Date: Sun Mar 27 16:24:31 2011
> New Revision: 1085978
>
> URL: http://svn.apache.org/viewvc?rev=1085978&view=rev
> Log:
> Moved platform-specific stuff to build/apr_hints.m4.
>
> Modified:
>      apr/apr/trunk/build/apr_hints.m4
>      apr/apr/trunk/configure.in
>
> Modified: apr/apr/trunk/build/apr_hints.m4
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_hints.m4?rev=1085978&r1=1085977&r2=1085978&view=diff
> ==============================================================================
> --- apr/apr/trunk/build/apr_hints.m4 (original)
> +++ apr/apr/trunk/build/apr_hints.m4 Sun Mar 27 16:24:31 2011
> @@ -442,16 +442,20 @@ dnl	       # Not a problem in 10.20.  Ot
>   	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
>   	;;
>       *mingw*)
> +        APR_ADDTO(CPPFLAGS, [-DWIN32])
>   	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_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(apr_thread_func, [__stdcall])
> +        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])
>
> Modified: apr/apr/trunk/configure.in
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1085978&r1=1085977&r2=1085978&view=diff
> ==============================================================================
> --- apr/apr/trunk/configure.in (original)
> +++ apr/apr/trunk/configure.in Sun Mar 27 16:24:31 2011
> @@ -553,10 +553,6 @@ case $host in
>          ;;
>      *-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"
>          enable_threads="system_threads"
>          eolstr="\\r\\n"
>          file_as_socket="0"
> @@ -565,7 +561,6 @@ case $host in
>          ;;
>      *cygwin*)
>          OSDIR="unix"
> -       APR_ADDTO(CPPFLAGS,-DCYGWIN)
>          enable_threads="no"
>          eolstr="\\n"
>          ;;
>


Mime
View raw message