Merge commit 'origin/master' into pr4225

* commit 'origin/master':
  Mention distro specific elfutils development sub-packages needed when not found.
  Change system-wide probes from 'process("*").begin' to 'process.begin'.
  PR6836: tweak $$return formatting
  extend callgraph example to use $$parms / $$return
  PR6836: $$vars extensions, $$return
  small patch ...
  PR 6834
  PR6842: work around possibly null task->signal in utrace death callback
  Minor bugs in stap-client.
  build compatibility and speed hack for bundled-elfutils mode
  revise build instructions; clarifying elfutils bundling and its new hosting site
  kbuild compatibility hack for separate-objdir O= builds
  PR 6445 (partial).  Implemented system-wide utrace probes.
  Fixed compilation warning on gcc 3.x
  let $$vars work even with unsupported c types (e.g., funkytown floats)

1 files changed, 12 insertions, 11 deletions

diff --git a/configure b/configure
index be952838..ecf080bf 100755
--- a/configure
+++ b/configure
@@ -6605,7 +6605,7 @@ fi
 
 
 if test $build_elfutils = no; then
-  # Need libdwfl-capable recent elfutils from Fedora
+  # Need libdwfl-capable recent elfutils http://elfutils.fedorahosted.org/
   save_LIBS="$LIBS"
 
 { echo "$as_me:$LINENO: checking for dwfl_module_getsym in -ldw" >&5
@@ -6678,8 +6678,8 @@ _ACEOF
 
 else
 
-    { { echo "$as_me:$LINENO: error: missing elfutils development headers/libraries (dw 0.123+)" >&5
-echo "$as_me: error: missing elfutils development headers/libraries (dw 0.123+)" >&2;}
+    { { echo "$as_me:$LINENO: error: missing elfutils development headers/libraries (install elfutils-devel, libebl-dev, libdw-dev and/or libebl-devel)" >&5
+echo "$as_me: error: missing elfutils development headers/libraries (install elfutils-devel, libebl-dev, libdw-dev and/or libebl-devel)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -8455,21 +8455,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -8506,7 +8507,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \