aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRob Savoye <rob.savoye@linaro.org>2014-04-24 19:15:22 -0600
committerRob Savoye <rob.savoye@linaro.org>2014-04-24 19:15:22 -0600
commitf43fecd744a0007b58b381ecffdf141764ef4a64 (patch)
tree50699434d8ffd0c03201713c7433454d77eae95f /configure
parent8e99e23414c98ab018c6caec2c720687dccaf5b9 (diff)
regenerated
Change-Id: Ia384055577f9ea29f45686d185ab87f7b2a41f33
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure51
1 files changed, 51 insertions, 0 deletions
diff --git a/configure b/configure
index 5ecfe8fa..16b3ab29 100755
--- a/configure
+++ b/configure
@@ -584,6 +584,7 @@ PACKAGE_URL=''
ac_unique_file="cbuild2.sh"
ac_subst_vars='LTLIBOBJS
LIBOBJS
+MAKEINFO
NEWWORKDIR
DEJAGNU
LIBTOOL
@@ -3951,6 +3952,56 @@ $as_echo "$as_me: WARNING: You need to install git-new-workdir to use GIT!" >&2;
# missing="${missing} git-new-workdir"
fi
+# 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 ${ac_cv_path_MAKEINFO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MAKEINFO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
+ $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
+
+ ;;
+esac
+fi
+MAKEINFO=$ac_cv_path_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
+
+
+# Texinfo 5 can't process the gcc texinfo files until they are fixed,
+# so we have to disable it for Ubuntu 14.04 "trusty".
+if test `lsb_release -i -s` = "Ubuntu"; then
+ texversion="`dpkg-query -W -f='\${Version}' texinfo | cut -d '.' -f 1`"
+ if test "${texversion}" -gt 4; then
+ MAKEINFO="missing"
+ fi
+fi
+
+
ac_config_files="$ac_config_files host.conf"
cat >confcache <<\_ACEOF