diff options
| author | roland <roland> | 2005-12-12 05:51:54 +0000 |
|---|---|---|
| committer | roland <roland> | 2005-12-12 05:51:54 +0000 |
| commit | 4d9087fcfe475185ef08a16fef31942f06d60f54 (patch) | |
| tree | a04eb7820ff55199979c721c1c13f523705e185d /configure.ac | |
| parent | c89b8e696681cbb8372db43da4ebf458ed387b6c (diff) | |
| download | systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.tar.gz systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.tar.xz systemtap-steved-4d9087fcfe475185ef08a16fef31942f06d60f54.zip | |
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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 38 insertions, 7 deletions
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 |