diff options
| author | Josh Stone <joshua.i.stone@intel.com> | 2008-06-27 16:19:19 -0700 |
|---|---|---|
| committer | Josh Stone <joshua.i.stone@intel.com> | 2008-06-27 16:19:19 -0700 |
| commit | cfa2ca3cbf2da7bbabcdf35c3085a969bd2370e4 (patch) | |
| tree | 9296b39e54c6cca8ac0a482350ee679ac527867d /configure.ac | |
| parent | 5e86a4eef7e29d89849d522bcdbe96e7a1e4b6b8 (diff) | |
| download | systemtap-steved-cfa2ca3cbf2da7bbabcdf35c3085a969bd2370e4.tar.gz systemtap-steved-cfa2ca3cbf2da7bbabcdf35c3085a969bd2370e4.tar.xz systemtap-steved-cfa2ca3cbf2da7bbabcdf35c3085a969bd2370e4.zip | |
Always include libdw using link groups.
This is necessary for distros that ship static libdw, Roland suggested
that it shouldn't hurt to do it this way on other distros too. It's
nicer now not to require the extra "--enable-staticdw" configure flag.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index ed099702..c7338f80 100644 --- a/configure.ac +++ b/configure.ac @@ -180,36 +180,17 @@ AM_CONDITIONAL(BUILD_ELFUTILS, test $build_elfutils = yes) AC_SUBST(elfutils_abs_srcdir, `AS_IF([test $build_elfutils = yes], [cd $with_elfutils && pwd])`) -AC_ARG_ENABLE([staticdw], - [AS_HELP_STRING([--enable-staticdw], [support distributions with static libdw])]) - if test $build_elfutils = no; then # Need libdwfl-capable recent elfutils from Fedora save_LIBS="$LIBS" - AS_IF([test "x$enable_staticdw" != xyes],[ - AC_CHECK_LIB(dw, dwfl_module_getsym,,[ - AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])]) - AC_CHECK_LIB(ebl, ebl_openbackend,,[ - AC_MSG_ERROR([missing elfutils development headers/libraries (ebl 0.123+)])]) - - stap_LIBS="$LIBS" - ],[ - # Debian ships with a static libdw, which has a circular dependency on libebl - AC_CHECK_LIB(dw, dwfl_module_getsym,[],[ - AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])], - [-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf]) - dnl XXX Do we need the ebl check, since it was referenced above? - AC_CHECK_LIB(ebl, ebl_openbackend,[],[ - AC_MSG_ERROR([missing elfutils development headers/libraries (ebl 0.123+)])], - [-lelf]) - - stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf" - ]) + AC_CHECK_LIB(dw, dwfl_module_getsym,[],[ + AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])], + [-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf]) + stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf" LIBS="$save_LIBS" else # We built our own and stap_LDFLAGS points at the install. - AS_IF([test "x$enable_staticdw" != xyes],[stap_LIBS="-ldw -lebl"], - [stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"]) + stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf" fi AC_SUBST(stap_LIBS) |