2005-12-11 Roland McGrath <roland@redhat.com>

	* configure.ac: Bump version to 0.5.1 for test builds.
	* systemtap.spec.in: Remove ExclusiveArch.
	* configure: Regenerated.
	PR 1916
	* configure.ac: Grok --with-elfutils.
	* Makefile.am [BUILD_ELFUTILS] (install-elfutils, stamp-elfutils):
	New targets.
	[BUILD_ELFUTILS] (stap_LDFLAGS, stap_LDFLAGS): Add flags
	to point at local elfutils build.
	[BUILD_ELFUTILS] (BUILT_SOURCES): Add stamp-elfutils.
	[BUILD_ELFUTILS] (stap_DEPENDENCIES): New variable.
	[BUILD_ELFUTILS] (lib-elfutils/libdw.so): New target.
	[BUILD_ELFUTILS] (install-exec-local): Depend on install-elfutils.
	(loc2c_test_LDADD): Set this to $(stap_LDADD).
	(loc2c_test_CPPFLAGS, loc2c_test_LDFLAGS): New variables.
	* Makefile.in: Regenerated.
	* compile: New file from automakeland.
	* systemtap.spec.in (elfutils_version): Require 0.118 or later.
	[bundled_elfutils]: Remove old hacks for building elfutils, and rely
	on configure --with-elfutils instead.

3 files changed, 120 insertions, 55 deletions

diff --git a/configure b/configure
index 0fc16037..de85447b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for systemtap 0.5.
+# Generated by GNU Autoconf 2.59 for systemtap 0.5.1.
 #
 # Report bugs to <systemtap@sources.redhat.com>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='systemtap'
 PACKAGE_TARNAME='systemtap'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='systemtap 0.5'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='systemtap 0.5.1'
 PACKAGE_BUGREPORT='systemtap@sources.redhat.com'
 
 # Factoring default headers for most tests.
@@ -310,7 +310,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB stap_LIBS DATE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB BUILD_ELFUTILS_TRUE BUILD_ELFUTILS_FALSE stap_LIBS DATE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -787,7 +787,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures systemtap 0.5 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -849,7 +849,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of systemtap 0.5:";;
+     short | recursive ) echo "Configuration of systemtap 0.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -861,6 +861,12 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-elfutils=DIRECTORY
+                          find elfutils source code in DIRECTORY
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -971,7 +977,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-systemtap configure 0.5
+systemtap configure 0.5.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -985,7 +991,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by systemtap $as_me 0.5, which was
+It was created by systemtap $as_me 0.5.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1630,7 +1636,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='systemtap'
- VERSION='0.5'
+ VERSION='0.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5072,7 +5078,34 @@ fi
 
 
 
-save_LIBS="$LIBS"
+build_elfutils=no
+
+# Check whether --with-elfutils or --without-elfutils was given.
+if test "${with_elfutils+set}" = set; then
+  withval="$with_elfutils"
+
+case "$with_elfutils" in
+yes) { { echo "$as_me:$LINENO: error: --with-elfutils requires an argument" >&5
+echo "$as_me: error: --with-elfutils requires an argument" >&2;}
+   { (exit 1); exit 1; }; } ;;
+''|no) ;;
+*) build_elfutils=yes ;;
+esac
+fi;
+
+
+if test $build_elfutils = yes; then
+  BUILD_ELFUTILS_TRUE=
+  BUILD_ELFUTILS_FALSE='#'
+else
+  BUILD_ELFUTILS_TRUE='#'
+  BUILD_ELFUTILS_FALSE=
+fi
+
+
+if test $build_elfutils = yes; then
+  # Need libdwfl-capable recent elfutils from Fedora
+  save_LIBS="$LIBS"
 
 
 echo "$as_me:$LINENO: checking for dwarf_diecu in -ldw" >&5
@@ -5148,13 +5181,17 @@ _ACEOF
 
 else
 
-  { { echo "$as_me:$LINENO: error: systemtap requires elfutils 0.116+" >&5
+    { { echo "$as_me:$LINENO: error: systemtap requires elfutils 0.116+" >&5
 echo "$as_me: error: systemtap requires elfutils 0.116+" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-stap_LIBS="$LIBS"
-LIBS="$SAVE_LIBS"
+  stap_LIBS="$LIBS"
+  LIBS="$SAVE_LIBS"
+else
+  # We built our own and stap_LDFLAGS points at the install.
+  stap_LIBS=-ldw
+fi
 
 
 date=`date +%Y-%m-%d`
@@ -5296,6 +5333,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_ELFUTILS_TRUE}" && test -z "${BUILD_ELFUTILS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_ELFUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_ELFUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -5567,7 +5611,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by systemtap $as_me 0.5, which was
+This file was extended by systemtap $as_me 0.5.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5630,7 +5674,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-systemtap config.status 0.5
+systemtap config.status 0.5.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -5888,6 +5932,8 @@ s,@U@,$U,;t t
 s,@ANSI2KNR@,$ANSI2KNR,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@BUILD_ELFUTILS_TRUE@,$BUILD_ELFUTILS_TRUE,;t t
+s,@BUILD_ELFUTILS_FALSE@,$BUILD_ELFUTILS_FALSE,;t t
 s,@stap_LIBS@,$stap_LIBS,;t t
 s,@DATE@,$DATE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
@@ -6607,3 +6653,18 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+
+if test $build_elfutils = yes; then
+  case "$with_elfutils" in
+  /*) elfutils_srcdir="$with_elfutils" ;;
+  *) elfutils_srcdir="../$with_elfutils" ;;
+  esac
+  { echo "$as_me:$LINENO: running ${elfutils_srcdir}/configure" >&5
+echo "$as_me: running ${elfutils_srcdir}/configure" >&6;}
+  here=`pwd`
+  (mkdir -p build-elfutils && cd build-elfutils &&
+   ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
+				--includedir="${here}/include-elfutils" \
+				--libdir="${here}/lib-elfutils"
+  )
+fi
diff --git a/configure.ac b/configure.ac
index 50c5c710..7fea2aca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl configure.ac --- autoconf input file for systemtap
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([systemtap], 0.5, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.5.1, systemtap@sources.redhat.com, systemtap)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE
@@ -22,12 +22,29 @@ AC_PROG_MAKE_SET
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 
-dnl Need libdwfl-capable recent elfutils from Fedora
-save_LIBS="$LIBS"
-AC_CHECK_LIB(dw, dwarf_diecu,,[
-  AC_MSG_ERROR([systemtap requires elfutils 0.116+])])
-stap_LIBS="$LIBS"
-LIBS="$SAVE_LIBS"
+build_elfutils=no
+AC_ARG_WITH([elfutils],
+            AC_HELP_STRING([--with-elfutils=DIRECTORY],
+                           [find elfutils source code in DIRECTORY]),
+	    [
+case "$with_elfutils" in
+yes) AC_MSG_ERROR([--with-elfutils requires an argument]) ;;
+''|no) ;;
+*) build_elfutils=yes ;;
+esac])
+AM_CONDITIONAL(BUILD_ELFUTILS, test $build_elfutils = yes)
+
+if test $build_elfutils = yes; then
+  # Need libdwfl-capable recent elfutils from Fedora
+  save_LIBS="$LIBS"
+  AC_CHECK_LIB(dw, dwarf_diecu,,[
+    AC_MSG_ERROR([systemtap requires elfutils 0.116+])])
+  stap_LIBS="$LIBS"
+  LIBS="$SAVE_LIBS"
+else
+  # We built our own and stap_LDFLAGS points at the install.
+  stap_LIBS=-ldw
+fi
 AC_SUBST(stap_LIBS)
 
 dnl Plop in the build (configure) date
@@ -38,3 +55,17 @@ AC_SUBST(DATE, "$date")
 AC_CONFIG_HEADERS([config.h:config.in])
 AC_CONFIG_FILES(Makefile systemtap.spec stp_check stap.1 stapprobes.5 stapfuncs.5 stapex.5)
 AC_OUTPUT
+
+if test $build_elfutils = yes; then
+  case "$with_elfutils" in
+  /*) elfutils_srcdir="$with_elfutils" ;;
+  *) elfutils_srcdir="../$with_elfutils" ;;
+  esac
+  AC_MSG_NOTICE([running ${elfutils_srcdir}/configure])
+  here=`pwd`
+  (mkdir -p build-elfutils && cd build-elfutils &&
+   ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
+				--includedir="${here}/include-elfutils" \
+				--libdir="${here}/lib-elfutils"
+  )
+fi
diff --git a/systemtap.spec.in b/systemtap.spec.in
index eb412743..e4cd45a8 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -1,5 +1,5 @@
 %define bundled_elfutils 1
-%define elfutils_version 0.116
+%define elfutils_version 0.118
 
 Name: systemtap
 Version: @VERSION@
@@ -10,8 +10,6 @@ License: GPL
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz
 
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
@@ -50,29 +48,7 @@ cd ..
 
 %if %{bundled_elfutils}
 # Build our own copy of elfutils.
-elfutils_includedir="`pwd`/include-elfutils"
-elfutils_libdir="`pwd`/lib-elfutils"
-mkdir build-elfutils
-cd build-elfutils
-cat > configure <<\EOF
-#!/bin/sh
-exec ../elfutils-%{elfutils_version}/configure "$@"
-EOF
-chmod +x configure
-LDFLAGS=-Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name}
-export LDFLAGS
-%configure --enable-libebl-subdir=%{name}
-make %{?_smp_mflags}
-for dir in libelf libebl libdw libdwfl; do
-  make -C $dir install includedir=$elfutils_includedir libdir=$elfutils_libdir
-done
-cd ..
-
-# We'll configure with these options to use the local headers and libraries.
-CPPFLAGS="-I${elfutils_includedir}"
-LDFLAGS="-L${elfutils_libdir} -Wl,-rpath-link,${elfutils_libdir} \
--Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name}"
-export CPPFLAGS LDFLAGS
+%define elfutils_config --with-elfutils=elfutils-%{elfutils_version}
 
 # We have to prevent the standard dependency generation from identifying
 # our private elfutils libraries in our provides and requires.
@@ -85,7 +61,7 @@ export CPPFLAGS LDFLAGS
 %define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
 %endif
 
-%configure
+%configure %{?elfutils_config}
 make %{?_smp_mflags}
 
 %install
@@ -93,12 +69,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %makeinstall
 
-%if %{bundled_elfutils}
-installed_elfutils=${RPM_BUILD_ROOT}%{_libdir}/%{name}
-mkdir -p ${installed_elfutils}
-cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/
-%endif
-
 mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
 
 %check
@@ -130,6 +100,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Dec  7 2005 Roland McGrath <roland@redhat.com> - 0.5.1-1
+- elfutils update, build changes
+
 * Fri Dec 02 2005  Frank Ch. Eigler  <fche@redhat.com> - 0.5-1
 - Many fixes and improvements: 1425, 1536, 1505, 1380, 1329, 1828, 1271,
   1339, 1340, 1345, 1837, 1917, 1903, 1336, 1868, 1594, 1564, 1276, 1295