From dee708f4bc9aa169bd96e97c5e5ac851a10c7868 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Thu, 5 Sep 2013 19:44:41 +0900 Subject: Missing -llzma in libunwind.pc liblzuma used in decoding MiniDebuginfo is not listed in libunwind.pc. Changes in version 2 of patch: * Don't check HAVE_LZMA. It is redundant. * Make liblzma as private libraries in use. Both are suggested by Mike Frysinger . Signed-off-by: Masatake YAMATO --- configure.ac | 4 +++- src/Makefile.am | 4 +--- src/unwind/libunwind.pc.in | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8e7a12a3..4e2fd236 100644 --- a/configure.ac +++ b/configure.ac @@ -255,19 +255,21 @@ if test x$enable_msabi_support = xyes; then fi AC_MSG_RESULT([$enable_msabi_support]) +LIBLZMA= AC_MSG_CHECKING([whether to support LZMA-compressed symbol tables]) AC_ARG_ENABLE(minidebuginfo, AS_HELP_STRING([--enable-minidebuginfo], [Enables support for LZMA-compressed symbol tables]),, [enable_minidebuginfo=auto]) AC_MSG_RESULT([$enable_minidebuginfo]) if test x$enable_minidebuginfo != xno; then AC_CHECK_LIB([lzma], [lzma_mf_is_supported], - [AC_SUBST([LIBLZMA], [-lzma]) + [LIBLZMA=-llzma AC_DEFINE([HAVE_LZMA], [1], [Define if you have liblzma]) enable_minidebuginfo=yes], [if test x$enable_minidebuginfo = xyes; then AC_MSG_FAILURE([liblzma not found]) fi]) fi +AC_SUBST([LIBLZMA]) AM_CONDITIONAL(HAVE_LZMA, test x$enable_minidebuginfo = xyes) LIBUNWIND___THREAD diff --git a/src/Makefile.am b/src/Makefile.am index 8c0c098e..cf137c08 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -611,9 +611,7 @@ endif libunwind_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -XCClinker -nostdlib \ $(LDFLAGS_STATIC_LIBCXA) -version-info $(SOVERSION) libunwind_la_LIBADD += -lc $(LIBCRTS) -if HAVE_LZMA - libunwind_la_LIBADD += -llzma -endif +libunwind_la_LIBADD += $(LIBLZMA) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I. AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/src/unwind/libunwind.pc.in b/src/unwind/libunwind.pc.in index 503d7f27..1505c5d6 100644 --- a/src/unwind/libunwind.pc.in +++ b/src/unwind/libunwind.pc.in @@ -7,4 +7,5 @@ Name: libunwind Description: libunwind base library Version: @VERSION@ Libs: -L${libdir} -lunwind +Libs.private: @LIBLZMA@ Cflags: -I${includedir} -- cgit v1.2.1