From fa1d05cdfff44b39584ba03831dae7d3f7b2258c Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 18 Oct 2006 21:23:53 +0000 Subject: 2006-10-18 Roland McGrath PR 2727 * configure.ac (elfutils build): Pass --prefix and --exec-prefix options to elfutils configure. (elfutils_abs_srcdir): New substituted variable. * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. * configure, config.in, Makefile.in: Regenerated. --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9ce815db..9231dce3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -fexceptions \ -Wall -Werror -Wshadow -Wunused -Wformat=2 -W AM_CXXFLAGS = -Wall -dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.tcp.5 man/stapprobes.udp.5 +dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.tcp.5 man/stapprobes.udp.5 bin_PROGRAMS = stap staprun stap_SOURCES = main.cxx \ parse.cxx staptree.cxx elaborate.cxx translate.cxx \ @@ -25,6 +25,9 @@ stap_LDFLAGS = $(AM_LDFLAGS) CLEANFILES = if BUILD_ELFUTILS +# This tells automake's "make distcheck" what we need to compile. +DISTCHECK_CONFIGURE_FLAGS = --with-elfutils=$(elfutils_abs_srcdir) + stap_CPPFLAGS += -Iinclude-elfutils stap_LDFLAGS += -Llib-elfutils -Wl,-rpath-link,lib-elfutils \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) @@ -109,4 +112,3 @@ SUBDIRS = testsuite if BUILD_LKET_B2A SUBDIRS += runtime/lket/b2a endif - -- cgit