diff --git a/config/macros.m4 b/config/macros.m4 index 88db6877..532167e8 100644 --- a/config/macros.m4 +++ b/config/macros.m4 @@ -1868,6 +1868,9 @@ AC_DEFUN([AX_PROG_DYNINST], dnl Check for stackwalk within DynInst (is Dyninst > 7.0.1?) AM_CONDITIONAL(DYNINST_HAVE_STACKWALK, test -f "${DYNINST_LIBSDIR}/libstackwalk.so") + dnl Check for DynInst flavour: Lite or Full? + AM_CONDITIONAL(DYNINST_IS_LITE, test -f "${DYNINST_LIBSDIR}/libsymLite.so") + dnl Did the checks pass? AM_CONDITIONAL(HAVE_DYNINST, test "${DYNINST_INSTALLED}" = "yes") diff --git a/src/launcher/dyninst/Makefile.am b/src/launcher/dyninst/Makefile.am index 78926880..5c9f00b1 100644 --- a/src/launcher/dyninst/Makefile.am +++ b/src/launcher/dyninst/Makefile.am @@ -15,7 +15,14 @@ DYNINST_EXTRA_LIBS += -lpatchAPI endif # Step #2, add pcontrol, stackwalk, dynDwarf/Elf and symLite if DYNINST_HAVE_STACKWALK -DYNINST_EXTRA_LIBS += -lpcontrol -lstackwalk -lcommon -ldynDwarf -ldynElf -lsymLite +DYNINST_EXTRA_LIBS += -lpcontrol -lstackwalk -lcommon -ldynDwarf -ldynElf +endif +# Step #3, add symLite if DynInst was configured with LIGHTWEIGHT_SYMTAB=On, all +# other required libraries otherwise. +if DYNINST_IS_LITE +DYNINST_EXTRA_LIBS += -lsymLite +else +DYNINST_EXTRA_LIBS += -lsymtabAPI endif extrae_SOURCES = extrae.C \