diff options
| author | roland <roland> | 2005-07-29 08:37:14 +0000 |
|---|---|---|
| committer | roland <roland> | 2005-07-29 08:37:14 +0000 |
| commit | a74dd27686283bbff26496ecb4bb08905e255972 (patch) | |
| tree | 609825173472ea25f5aa5028bfbf45f19f3969ff /configure.ac | |
| parent | 2a262f6a7f59e41a3c65597662dbf278ab9fef89 (diff) | |
| download | systemtap-steved-a74dd27686283bbff26496ecb4bb08905e255972.tar.gz systemtap-steved-a74dd27686283bbff26496ecb4bb08905e255972.tar.xz systemtap-steved-a74dd27686283bbff26496ecb4bb08905e255972.zip | |
2005-07-29 Roland McGrath <roland@redhat.com>
* configure.ac: Add AM_CONDITIONAL definition of HAVE_LIBDW.
* Makefile.am [HAVE_LIBDW] (stap_SOURCES_libdw): New variable.
(stap_SOURCES): Use it, moving loc2c.c there.
* configure, config.in: Regenerated.
* configure.ac: Don't check for libelf.h, not actually #include'd.
Update -ldw check for merged libdwfl+libdw.
(stap_LIBS): New substituted variable. Set only this, not LIBS,
with -ldw check.
* Makefile.am (stap_LDADD): New variable, use @stap_LIBS@.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 05040698..b90d7820 100644 --- a/configure.ac +++ b/configure.ac @@ -22,13 +22,20 @@ AC_PROG_MAKE_SET AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) -dnl Need libdwfl-capable elfutils 0.102+ from <drepper@redhat.com> +dnl Need libdwfl-capable elfutils 0.111 or later from Fedora dnl ... except that these libraries are only used by stap, not dnl stpd. The implicit LIBS set from these is too broadly applied. -AC_CHECK_HEADERS([libelf.h elfutils/libdw.h elfutils/libdwfl.h]) -AC_CHECK_LIB(dw, dwarf_begin) -AC_CHECK_LIB(elf, elf_begin) -AC_CHECK_LIB(dwfl, dwfl_begin) +save_LIBS="$LIBS" +AC_CHECK_LIB(dw, dwfl_begin) +stap_LIBS="$LIBS" +LIBS="$SAVE_LIBS" +AC_SUBST(stap_LIBS) +if test $ac_cv_lib_dw_dwfl_begin = yes; then + # If we don't have a current library, don't define HAVE_*_H macros either. + AC_CHECK_HEADERS([elfutils/libdw.h elfutils/libdwfl.h]) +fi + +AM_CONDITIONAL(HAVE_LIBDW, test $ac_cv_lib_dw_dwfl_begin = yes) dnl Plop in the build (configure) date date=`date +%Y-%m-%d` |