This file is part of MXE. See index.html for further information. This patch has been taken from: http://sourceware.org/bugzilla/show_bug.cgi?id=13638 =================================================================== RCS file: /cvs/src/src/gdb/configure,v retrieving revision 1.335.2.2 retrieving revision 1.335.2.3 diff -u -r1.335.2.2 -r1.335.2.3 --- src/gdb/configure 2012/02/21 22:03:47 1.335.2.2 +++ src/gdb/configure 2012/02/21 22:07:40 1.335.2.3 @@ -995,6 +995,8 @@ LIBS CPPFLAGS CPP +MAKEINFO +MAKEINFOFLAGS YACC YFLAGS XMKMF' @@ -1696,6 +1698,9 @@ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + MAKEINFO Parent configure detects if it is of sufficient version. + MAKEINFOFLAGS + Parameters for MAKEINFO. YACC The `Yet Another C Compiler' implementation to use. Defaults to the first program found out of: `bison -y', `byacc', `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. @@ -7158,59 +7163,9 @@ -# Do we have a single-tree copy of texinfo? Even if we do, we can't -# rely on it - libiberty is built before texinfo. -# Extract the first word of "makeinfo", so it can be a program name with args. -set dummy makeinfo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MAKEINFO+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MAKEINFO"; then - ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MAKEINFO="makeinfo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MAKEINFO=$ac_cv_prog_MAKEINFO -if test -n "$MAKEINFO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5 -$as_echo "$MAKEINFO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "x$MAKEINFO" = "x"; then - as_fn_error "makeinfo is required for compilation" "$LINENO" 5 -else - case "$MAKEINFO" in - */missing\ makeinfo*) - as_fn_error "makeinfo is required for compilation" "$LINENO" 5 - ;; - esac -fi - +# We never need to detect it in this sub-configure. +# But preserve it for config.status --recheck. -# --split-size=5000000 may be already in $MAKEINFO from parent configure. -# Re-running configure in gdb/ would lose it so ensure it stays present. -MAKEINFOFLAGS=${MAKEINFOFLAGS---split-size=5000000} MAKEINFO_EXTRA_FLAGS=""