mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/

Browse Source 
PR build/13638
	* configure.ac (MAKEINFO): Replace AC_CHECK_PROG by AC_ARG_VAR.
	(MAKEINFOFLAGS): Replace static string by AC_ARG_VAR.
	* configure: Regenerate.
This commit is contained in:
Jan Kratochvil 2012-02-21 22:00:32 +00:00
parent 6a5870cea1
commit f06e05e0a4
3 changed files with 20 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-21 Jan Kratochvil <jan.kratochvil@redhat.com>
PR build/13638
* configure.ac (MAKEINFO): Replace AC_CHECK_PROG by AC_ARG_VAR.
(MAKEINFOFLAGS): Replace static string by AC_ARG_VAR.
* configure: Regenerate.
2012-02-21 Tristan Gingold <gingold@adacore.com>
Pedro Alves <palves@redhat.com>

59
gdb/configure vendored
View File

@ -994,6 +994,8 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
MAKEINFO
MAKEINFOFLAGS
YACC
YFLAGS
XMKMF'
@ -1695,6 +1697,9 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
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.
@ -7157,59 +7162,9 @@ _ACEOF
# 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
# We never need to detect it in this sub-configure.
# But preserve it for config.status --recheck.
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
# --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=""

24
gdb/configure.ac
View File

@ -85,24 +85,12 @@ PACKAGE=gdb
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
AC_SUBST(PACKAGE)
# Do we have a single-tree copy of texinfo? Even if we do, we can't
# rely on it - libiberty is built before texinfo.
AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
if test "x$MAKEINFO" = "x"; then
AC_ERROR([makeinfo is required for compilation])
else
case "$MAKEINFO" in
*/missing\ makeinfo*)
AC_ERROR([makeinfo is required for compilation])
;;
esac
fi
AC_SUBST(MAKEINFO)
# --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}
AC_SUBST(MAKEINFOFLAGS)
# We never need to detect it in this sub-configure.
# But preserve it for config.status --recheck.
AC_ARG_VAR(MAKEINFO,
[Parent configure detects if it is of sufficient version.])
AC_ARG_VAR(MAKEINFOFLAGS,
[Parameters for MAKEINFO.])
MAKEINFO_EXTRA_FLAGS=""
AC_CACHE_CHECK([whether $MAKEINFO supports @click], gdb_cv_have_makeinfo_click,