regenerated

1 files changed, 40 insertions, 34 deletions

diff --git a/configure b/configure
index 49b3991b..18a5e93a 100755
--- a/configure
+++ b/configure
@@ -584,8 +584,8 @@ PACKAGE_URL=''
 ac_unique_file="cbuild2.sh"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-MAKEINFO
 NEWWORKDIR
+MAKEINFO
 DEJAGNU
 LIBTOOL
 AUTOMAKE
@@ -4089,16 +4089,16 @@ $as_echo "$as_me: WARNING: You should install dejagnu so you can run tests" >&2;
    missing="${missing} dejagnu"
 fi
 
-# Extract the first word of "git-new-workdir", so it can be a program name with args.
-set dummy git-new-workdir; ac_word=$2
+# 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_NEWWORKDIR+:} false; then :
+if ${ac_cv_path_MAKEINFO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $NEWWORKDIR in
+  case $MAKEINFO in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_NEWWORKDIR="$NEWWORKDIR" # Let the user override the test with a path.
+  ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4108,7 +4108,7 @@ do
   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_NEWWORKDIR="$as_dir/$ac_word$ac_exec_ext"
+    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
@@ -4119,34 +4119,37 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-NEWWORKDIR=$ac_cv_path_NEWWORKDIR
-if test -n "$NEWWORKDIR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEWWORKDIR" >&5
-$as_echo "$NEWWORKDIR" >&6; }
+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
 
 
-   if test x"${NEWWORKDIR}" = x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need to install git-new-workdir to use GIT!" >&5
-$as_echo "$as_me: WARNING: You need to install git-new-workdir to use GIT!" >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: copy /usr/share/doc/git/contrib/workdir/git-new-workdir to /usr/local/bin and then make it executable" >&5
-$as_echo "$as_me: copy /usr/share/doc/git/contrib/workdir/git-new-workdir to /usr/local/bin and then make it executable" >&6;}
-      missing="${missing} git-new-workdir"
+# 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
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: On Ubuntu Trusty systems" >&5
+$as_echo "$as_me: WARNING: On Ubuntu Trusty systems" >&2;}
+   fi
 fi
 
-# Extract the first word of "makeinfo", so it can be a program name with args.
-set dummy makeinfo; ac_word=$2
+
+# Extract the first word of "git-new-workdir", so it can be a program name with args.
+set dummy git-new-workdir; 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 :
+if ${ac_cv_path_NEWWORKDIR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $MAKEINFO in
+  case $NEWWORKDIR in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
+  ac_cv_path_NEWWORKDIR="$NEWWORKDIR" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4156,7 +4159,7 @@ do
   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"
+    ac_cv_path_NEWWORKDIR="$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
@@ -4167,25 +4170,28 @@ 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; }
+NEWWORKDIR=$ac_cv_path_NEWWORKDIR
+if test -n "$NEWWORKDIR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEWWORKDIR" >&5
+$as_echo "$NEWWORKDIR" >&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="echo"
-   fi
+   if test x"${NEWWORKDIR}" = x; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need to install git-new-workdir to use GIT!" >&5
+$as_echo "$as_me: WARNING: You need to install git-new-workdir to use GIT!" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: copy /usr/share/doc/git/contrib/workdir/git-new-workdir to /usr/local/bin and then make it executable" >&5
+$as_echo "$as_me: copy /usr/share/doc/git/contrib/workdir/git-new-workdir to /usr/local/bin and then make it executable" >&6;}
+      missing="${missing} git-new-workdir"
 fi
 
+# A symbolic link needs to be made in this directory
+#if test -w /opt/linaro -eq 0; then
+#   AC_MSG_WARN([/opt/linaro is not writable!])
+#fi
 
 ac_config_files="$ac_config_files host.conf"