From ad643a75f71cefbfe50788933c5c847211a09fe4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 15 Oct 2004 07:58:38 +0000 Subject: re PR other/17991 (Two-process fixincludes broken: pz_mn_name_pat undefined) 2004-08-14 Paolo Bonzini PR other/17991 * Makefile.in (ALLOBJ, TESTOBJ, FIXOBJ): Add fixopts.o. Update copyright year. * fixfixes.c (main): Call initialize_opts from fixopts.c. * fixincl.c (initialize): Call initialize_opts from fixopts.c, do not include code for parsing options (environment vars). (fix_with_system): Use a search path for applyfix, so that you can run the test suite with two-process fixincludes. * fixopts.c: New file. * configure.ac: Add --enable-twoprocess. Export ac_exeext to config.h. Default to --enable-twoprocess for MinGW32. * config.h.in: Regenerate. * configure: Regenerate. From-SVN: r89087 --- fixincludes/configure | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'fixincludes/configure') diff --git a/fixincludes/configure b/fixincludes/configure index 8e9f630..d5da756 100755 --- a/fixincludes/configure +++ b/fixincludes/configure @@ -847,6 +847,7 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-twoprocess Use a separate process to apply the fixes --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -2343,19 +2344,39 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Choose one or two-process fix methodology. Systems that cannot handle # bi-directional pipes must use the two process method. # -case $host in +# Check whether --enable-twoprocess or --disable-twoprocess was given. +if test "${enable_twoprocess+set}" = set; then + enableval="$enable_twoprocess" + if test "x$enable_twoprocess" = yes; then + TARGET=twoprocess +else + TARGET=oneprocess +fi +else + case $host in i?86-*-msdosdjgpp* | \ + i?86-*-mingw32* | \ *-*-beos* ) TARGET=twoprocess + ;; + + * ) + TARGET=oneprocess + ;; +esac +fi; + + +if test $TARGET = twoprocess; then cat >>confdefs.h <<\_ACEOF #define SEPARATE_FIX_PROC 1 _ACEOF - ;; +fi +case $host in vax-dec-bsd* ) - TARGET=oneprocess cat >>confdefs.h <<\_ACEOF #define exit xexit @@ -2367,13 +2388,14 @@ cat >>confdefs.h <<\_ACEOF _ACEOF ;; - - * ) - TARGET=oneprocess - ;; esac +cat >>confdefs.h <<_ACEOF +#define EXE_EXT "$ac_exeext" +_ACEOF + + # Checks for header files. ac_ext=c -- cgit v1.1