Attachment #26607 for bug #46175

View | Details | Raw Unified | Return to bug 46175
Collapse All | Expand All

Lines 73-79 Link Here

(-)test/Makefile.in (-1 / +1 lines)
73		73
74	# link programs using -no-install to get real executables not	74	# link programs using -no-install to get real executables not
75	# libtool wrapper scripts which link an executable when first run.	75	# libtool wrapper scripts which link an executable when first run.
76	LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \	76	LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
77	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@	77	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
78		78
79	# STDTEST_PORTABLE;	79	# STDTEST_PORTABLE;





#define APR_PROCESS_LOCK_IS_GLOBAL        @proclockglobal@

#define APR_HAVE_CORKABLE_TCP   @have_corkable_tcp@
#define APR_HAVE_GETRLIMIT      @have_getrlimit@
#define APR_HAVE_IN_ADDR        @have_in_addr@
#define APR_HAVE_INET_ADDR      @have_inet_addr@

#define APR_HAS_SO_ACCEPTFILTER   @acceptfilter@
#define APR_HAS_UNICODE_FS        @have_unicode_fs@
#define APR_HAS_PROC_INVOKED      @have_proc_invoked@
#define APR_HAS_USER              @apr_has_user@
#define APR_HAS_LARGE_FILES       @aprlfs@
#define APR_HAS_XTHREAD_FILES     @xthread_files@
#define APR_HAS_OS_UUID           @osuuid@

#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0

#define APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@

/* Is the TCP_NODELAY socket option inherited from listening sockets?
 */
#define APR_TCP_NODELAY_INHERITED @tcp_nodelay_inherited@

/* Is the O_NONBLOCK flag inherited from listening sockets?
 */
#define APR_O_NONBLOCK_INHERITED @o_nonblock_inherited@

/* Typedefs that APR needs. */

 *
 * </PRE>
 */
#define APR_THREAD_FUNC          @apr_thread_func@

/**
 * The public APR functions are declared with APR_DECLARE(), so they may

Lines 292-298 Link Here

(-)configure.in (-15 / +22 lines)
292	if test "x$use_libtool" = "xyes"; then	292	if test "x$use_libtool" = "xyes"; then
293	lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'	293	lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
294	LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"	294	LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
295	link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"	295	link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
296	so_ext='lo'	296	so_ext='lo'
297	lib_target='-rpath $(libdir) $(OBJECTS)'	297	lib_target='-rpath $(libdir) $(OBJECTS)'
298	export_lib_target='-rpath \$(libdir) \$(OBJECTS)'	298	export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
Lines 308-313 Link Here
308	-solaris2)	308	-solaris2)
309	apr_platform_runtime_link_flag="-R"	309	apr_platform_runtime_link_flag="-R"
310	;;	310	;;
		311	-mingw \| -cygwin)
		312	LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
		313	;;
311	*)	314	*)
312	;;	315	;;
313	esac	316	esac
Lines 684-699 Link Here
684	dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.	687	dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.
685	case $host in	688	case $host in
686	-mingw)	689	-mingw)
687	dnl APR_ADDTO(LIBS,[-lmsvcrt --lshell32 -ladvapi32 -lws2_32])	690	APR_ADDTO(LIBS,[-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock])
688		691	ac_cv_func_CreateFileMapping=yes
689	AC_CHECK_LIB(msvcrt, getpid)
690	APR_CHECK_DLL_FUNC(kernel32, SetErrorMode@4)
691	APR_CHECK_DLL_FUNC(advapi32, GetSecurityInfo@32)
692	APR_CHECK_DLL_FUNC(ws2_32, gethostbyname@4)
693	APR_CHECK_DLL_FUNC(shell32, CommandLineToArgvW@8)
694	APR_CHECK_DLL_FUNC(kernel32,[CreateFileMappingA@24],
695	[ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA])
696	APR_CHECK_DLL_FUNC(rpcrt4,[UuidCreate@4])
697	;;	692	;;
698	*)	693	*)
699	AC_SEARCH_LIBS(gethostbyname, nsl)	694	AC_SEARCH_LIBS(gethostbyname, nsl)
Lines 2545-2556 Link Here
2545		2540
2546	dnl Do we have a Win32-centric Unicode FS?	2541	dnl Do we have a Win32-centric Unicode FS?
2547		2542
2548	if test -z "$have_unicode_fs"; then	2543	APR_SETIFNULL(have_unicode_fs, [0])
2549	have_unicode_fs="0"
2550	fi
2551
2552	AC_SUBST(have_unicode_fs)	2544	AC_SUBST(have_unicode_fs)
2553		2545
		2546
		2547	dnl ----------------------------- Other misc variable
		2548	APR_SETIFNULL(xthread_files, [0])
		2549	AC_SUBST(xthread_files)
		2550
		2551	APR_SETIFNULL(procattr_user_set_requires_pwd, [0])
		2552	AC_SUBST(procattr_user_set_requires_pwd)
		2553
		2554	APR_SETIFNULL(apr_thread_func, [])
		2555	AC_SUBST(apr_thread_func)
		2556
		2557	APR_SETIFNULL(apr_has_user, [1])
		2558	AC_SUBST(apr_has_user)
		2559
		2560
2554	dnl ------------------------------ APR-util stuff	2561	dnl ------------------------------ APR-util stuff
2555		2562
2556	APU_PRELOAD	2563	APU_PRELOAD




	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(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_SETIFNULL(apr_thread_func, [__stdcall])
	case $host in
		*mingw32*)
			APR_SETIFNULL(xthread_files, [1])
			APR_SETIFNULL(procattr_user_set_requires_pwd, [1])
			APR_SETIFNULL(apr_has_user, [1])
			# override the test for O_NONBLOCK inheritance.
			APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
			# override the test for TCP_NOPUSH inheritance.
			APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
		;;
		*mingwce)
			APR_SETIFNULL(xthread_files, [0])
			APR_SETIFNULL(procattr_user_set_requires_pwd, [0])
			APR_SETIFNULL(apr_has_user, [0])
		;;
	esac
	;;
  esac


Lines 22-28 Link Here

(-)support/unix/waitio.c (-1 / +1 lines)
22		22
23	/* The only case where we don't use wait_for_io_or_timeout is on	23	/* The only case where we don't use wait_for_io_or_timeout is on
24	* pre-BONE BeOS, so this check should be sufficient and simpler */	24	* pre-BONE BeOS, so this check should be sufficient and simpler */
25	#if !BEOS_R5 && !defined(OS2)	25	#if !BEOS_R5 && !defined(OS2) && APR_FILES_AS_SOCKETS
26	#define USE_WAIT_FOR_IO	26	#define USE_WAIT_FOR_IO
27	#endif	27	#endif
28		28

Return to bug 46175

Lines 256-262 Link Here

(-)include/apr.h.in (-6 / +6 lines)
256		256
257	#define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@	257	#define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@
258		258
259	#define APR_HAVE_CORKABLE_TCP @have_corkable_tcp@	259	#define APR_HAVE_CORKABLE_TCP @have_corkable_tcp@
260	#define APR_HAVE_GETRLIMIT @have_getrlimit@	260	#define APR_HAVE_GETRLIMIT @have_getrlimit@
261	#define APR_HAVE_IN_ADDR @have_in_addr@	261	#define APR_HAVE_IN_ADDR @have_in_addr@
262	#define APR_HAVE_INET_ADDR @have_inet_addr@	262	#define APR_HAVE_INET_ADDR @have_inet_addr@
Lines 293-301 Link Here
293	#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@	293	#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@
294	#define APR_HAS_UNICODE_FS @have_unicode_fs@	294	#define APR_HAS_UNICODE_FS @have_unicode_fs@
295	#define APR_HAS_PROC_INVOKED @have_proc_invoked@	295	#define APR_HAS_PROC_INVOKED @have_proc_invoked@
296	#define APR_HAS_USER 1	296	#define APR_HAS_USER @apr_has_user@
297	#define APR_HAS_LARGE_FILES @aprlfs@	297	#define APR_HAS_LARGE_FILES @aprlfs@
298	#define APR_HAS_XTHREAD_FILES 0	298	#define APR_HAS_XTHREAD_FILES @xthread_files@
299	#define APR_HAS_OS_UUID @osuuid@	299	#define APR_HAS_OS_UUID @osuuid@
300		300
301	#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0	301	#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
Lines 315-325 Link Here
315	#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@	315	#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@
316		316
317	/* Is the TCP_NODELAY socket option inherited from listening sockets?	317	/* Is the TCP_NODELAY socket option inherited from listening sockets?
318	*/	318	*/
319	#define APR_TCP_NODELAY_INHERITED @tcp_nodelay_inherited@	319	#define APR_TCP_NODELAY_INHERITED @tcp_nodelay_inherited@
320		320
321	/* Is the O_NONBLOCK flag inherited from listening sockets?	321	/* Is the O_NONBLOCK flag inherited from listening sockets?
322	*/	322	*/
323	#define APR_O_NONBLOCK_INHERITED @o_nonblock_inherited@	323	#define APR_O_NONBLOCK_INHERITED @o_nonblock_inherited@
324		324
325	/* Typedefs that APR needs. */	325	/* Typedefs that APR needs. */
Lines 469-475 Link Here
469	*	469	*
470	* </PRE>	470	* </PRE>
471	*/	471	*/
472	#define APR_THREAD_FUNC	472	#define APR_THREAD_FUNC @apr_thread_func@
473		473
474	/**	474	/**
475	* The public APR functions are declared with APR_DECLARE(), so they may	475	* The public APR functions are declared with APR_DECLARE(), so they may

Lines 442-464 Link Here

(-)build/apr_hints.m4 (-11 / +17 lines)
442	APR_ADDTO(CPPFLAGS, [-DCYGWIN])	442	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
443	;;	443	;;
444	mingw)	444	mingw)
445	dnl gcc (3.4.2 at least) seems to mis-optimize at levels greater than
446	dnl -O0 producing link-time errors. The user can override by
447	dnl explicitly passing a CFLAGS value to configure.
448	dnl
449	dnl Example error messages:
450	dnl undefined reference to 'libmsvcrt_a_iname'
451	dnl undefined reference to '_nm___pctype'
452	if test "$ac_test_CFLAGS" != set; then
453	APR_REMOVEFROM(CFLAGS,-O2)
454	APR_ADDTO(CFLAGS,-O0)
455	fi
456	APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])	445	APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
457	APR_SETIFNULL(apr_lock_method, [win32])	446	APR_SETIFNULL(apr_lock_method, [win32])
458	APR_SETIFNULL(apr_process_lock_is_global, [yes])	447	APR_SETIFNULL(apr_process_lock_is_global, [yes])
459	APR_SETIFNULL(have_unicode_fs, [1])	448	APR_SETIFNULL(have_unicode_fs, [1])
460	APR_SETIFNULL(have_proc_invoked, [1])	449	APR_SETIFNULL(have_proc_invoked, [1])
461	APR_SETIFNULL(apr_cv_use_lfs64, [yes])	450	APR_SETIFNULL(apr_cv_use_lfs64, [yes])
		451	APR_SETIFNULL(apr_thread_func, [__stdcall])
		452	case $host in
		453	mingw32)
		454	APR_SETIFNULL(xthread_files, [1])
		455	APR_SETIFNULL(procattr_user_set_requires_pwd, [1])
		456	APR_SETIFNULL(apr_has_user, [1])
		457	# override the test for O_NONBLOCK inheritance.
		458	APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
		459	# override the test for TCP_NOPUSH inheritance.
		460	APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
		461	;;
		462	*mingwce)
		463	APR_SETIFNULL(xthread_files, [0])
		464	APR_SETIFNULL(procattr_user_set_requires_pwd, [0])
		465	APR_SETIFNULL(apr_has_user, [0])
		466	;;
		467	esac
462	;;	468	;;
463	esac	469	esac
464		470