[ltrace-commits] 01/01: I only build the dwarf_prototypes if we have libdw

[Petr Machata]

This is an automated email from the git hooks/post-receive script.

pmachata-guest pushed a commit to branch master
in repository ltrace.

commit 26c5f9b0c4cc568fb5d390132e3acaa37b9d9dce
Author: Dima Kogan <dima at secretsauce.net>
Date:   Mon May 12 13:14:04 2014 -0700

    I only build the dwarf_prototypes if we have libdw
---
 Makefile.am  | 11 ++++++++---
 configure.ac |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6570cea..6ab11f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,10 @@ libltrace_la_SOURCES = bits.c breakpoints.c debug.c demangle.c dict.c	\
 	options.c output.c proc.c read_config_file.c summary.c		\
 	library.c filter.c glob.c type.c value.c value_dict.c expr.c	\
 	fetch.c vect.c param.c printf.c zero.c lens.c lens_default.c	\
-	lens_enum.c memstream.c prototype.c dwarf_prototypes.c
+	lens_enum.c memstream.c prototype.c
+if HAVE_LIBDW
+libltrace_la_SOURCES += dwarf_prototypes.c
+endif
 
 libltrace_la_LIBADD = \
 	$(libelf_LIBS) \
@@ -58,8 +61,10 @@ noinst_HEADERS = bits.h backend.h breakpoint.h common.h debug.h		\
 	options.h output.h proc.h read_config_file.h summary.h		\
 	library.h filter.h glob.h vect.h type.h value.h value_dict.h	\
 	callback.h expr.h fetch.h vect.h param.h printf.h zero.h	\
-	lens.h lens_default.h lens_enum.h memstream.h prototype.h	\
-	dwarf_prototypes.h
+	lens.h lens_default.h lens_enum.h memstream.h prototype.h
+if HAVE_LIBDW
+noinst_HEADERS += dwarf_prototypes.h
+endif
 
 dist_man1_MANS = ltrace.1
 dist_man5_MANS = ltrace.conf.5
diff --git a/configure.ac b/configure.ac
index 0e9a124..4f360c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,7 @@ if test x$use_valgrind = xyes; then
     fi
 fi
 AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes)
+AM_CONDITIONAL(HAVE_LIBDW, test x"$enable_elfutils" = xyes)
 
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CFLAGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ltrace.git