Attachment #358498 for bug #483192

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

Lines 8384-8392 case " $build_configdirs " in Link Here

(-)gcc-4.5.4/configure (-2 / +2 lines)
8384	*)	8384	*)
8385		8385
8386	# For an installed makeinfo, we require it to be from texinfo 4.7 or	8386	# For an installed makeinfo, we require it to be from texinfo 4.7 or
8387	# higher, else we use the "missing" dummy.	8387	# some higher 4.x, else we use the "missing" dummy.
8388	if ${MAKEINFO} --version \	8388	if ${MAKEINFO} --version \
8389	\| egrep 'texinfo[^0-9]*(4\.([7-9]\|[1-9][0-9])\|[5-9]\|[1-9][0-9])' >/dev/null 2>&1; then	8389	\| egrep 'texinfo[^0-9]*(4\.([7-9]\|[1-9][0-9]))' >/dev/null 2>&1; then
8390	:	8390	:
8391	else	8391	else
8392	MAKEINFO="$MISSING makeinfo"	8392	MAKEINFO="$MISSING makeinfo"





  if test -n "$MAKEINFO"; then
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 4.7+ makeinfo" >&5
$as_echo_n "checking for 4.7+ makeinfo... " >&6; }
if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then :
  $as_echo_n "(cached) " >&6
else


                    case $ac_prog_version in
                      '')  gcc_cv_prog_makeinfo_modern=no;;
                      4.[7-9]*|4.[1-9][0-9]*)  gcc_cv_prog_makeinfo_modern=yes;;
                      *)   gcc_cv_prog_makeinfo_modern=no;;
                    esac



if test $gcc_cv_prog_makeinfo_modern = no; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** Makeinfo is missing, too old or too new.
*** Info documentation will not be built." >&5
$as_echo "$as_me: WARNING:
*** Makeinfo is missing, too old or too new.
*** Info documentation will not be built." >&2;}
  BUILD_INFO=
else




        ;;
      *)
	case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
	  x*\ [1-35-9].* )
	    MAKEINFO="@echo $MAKEINFO is not 4.x; true"
	    BUILD_INFO=
	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** Makeinfo is not 4.x. Info documentation will not be built." >&5
$as_echo "$as_me: WARNING:
*** Makeinfo is not 4.x. Info documentation will not be built." >&2;}
	  ;;
	esac
	;;

Return to bug 483192

Lines 7401-7408 fi Link Here

(-)gcc-4.5.4/gcc/configure (-5 / +5 lines)
7401		7401
7402	if test -n "$MAKEINFO"; then	7402	if test -n "$MAKEINFO"; then
7403	# Found it, now check the version.	7403	# Found it, now check the version.
7404	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern makeinfo" >&5	7404	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 4.7+ makeinfo" >&5
7405	$as_echo_n "checking for modern makeinfo... " >&6; }	7405	$as_echo_n "checking for 4.7+ makeinfo... " >&6; }
7406	if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then :	7406	if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then :
7407	$as_echo_n "(cached) " >&6	7407	$as_echo_n "(cached) " >&6
7408	else	7408	else
Lines 7411-7417 else Link Here
7411		7411
7412	case $ac_prog_version in	7412	case $ac_prog_version in
7413	'') gcc_cv_prog_makeinfo_modern=no;;	7413	'') gcc_cv_prog_makeinfo_modern=no;;
7414	4.[7-9]\|4.[1-9][0-9]\|[5-9]\|[1-9][0-9]) gcc_cv_prog_makeinfo_modern=yes;;	7414	4.[7-9]\|4.[1-9][0-9]) gcc_cv_prog_makeinfo_modern=yes;;
7415	*) gcc_cv_prog_makeinfo_modern=no;;	7415	*) gcc_cv_prog_makeinfo_modern=no;;
7416	esac	7416	esac
7417		7417
Lines 7427-7436 $as_echo "$gcc_cv_prog_makeinfo_modern" Link Here
7427		7427
7428	if test $gcc_cv_prog_makeinfo_modern = no; then	7428	if test $gcc_cv_prog_makeinfo_modern = no; then
7429	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:	7429	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
7430	*** Makeinfo is missing or too old.	7430	*** Makeinfo is missing, too old or too new.
7431	*** Info documentation will not be built." >&5	7431	*** Info documentation will not be built." >&5
7432	$as_echo "$as_me: WARNING:	7432	$as_echo "$as_me: WARNING:
7433	*** Makeinfo is missing or too old.	7433	*** Makeinfo is missing, too old or too new.
7434	*** Info documentation will not be built." >&2;}	7434	*** Info documentation will not be built." >&2;}
7435	BUILD_INFO=	7435	BUILD_INFO=
7436	else	7436	else

Lines 2440-2452 $as_echo "$as_me: WARNING: Link Here

(-)gcc-4.5.4/libiberty/configure (-4 / +4 lines)
2440	;;	2440	;;
2441	*)	2441	*)
2442	case x"`$MAKEINFO --version \| grep 'GNU texinfo'`" in	2442	case x"`$MAKEINFO --version \| grep 'GNU texinfo'`" in
2443	x\ [1-3]. )	2443	x\ [1-35-9]. )
2444	MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"	2444	MAKEINFO="@echo $MAKEINFO is not 4.x; true"
2445	BUILD_INFO=	2445	BUILD_INFO=
2446	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:	2446	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
2447	*** Makeinfo is too old. Info documentation will not be built." >&5	2447	*** Makeinfo is not 4.x. Info documentation will not be built." >&5
2448	$as_echo "$as_me: WARNING:	2448	$as_echo "$as_me: WARNING:
2449	*** Makeinfo is too old. Info documentation will not be built." >&2;}	2449	*** Makeinfo is not 4.x. Info documentation will not be built." >&2;}
2450	;;	2450	;;
2451	esac	2451	esac
2452	;;	2452	;;