From 177a8ead26e48a61efd904103a9d189cb27009dd Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 1 Nov 2005 16:13:35 +0000 Subject: 2005-11-01 Frank Ch. Eigler PR 1425. * configure.ac: Look for rpm-devel headers and libs. * configure: Regenerated. * session.h: New file to contain systemtap_session decl. * staptree.h: Likewise evict statistics_decl. * elaborate.h: Corresponding changes. * main.cxx (usage): Elaborate. Re-enable "-r RELEASE" option. * parse.cxx (parser): Add systemtap_session& field. Update users. (scan_pp, eval_pp_conditional): New routines for preprocessing. (peek, next): Call it. (lexer::scan): Lex the preprocessor operators. (parser::parse): Include an extra level of exception catching for parse errors that occur during recovery. * parse.h: Corresponding changes. (parse_error): Allow explicit token parameter. * stap.1.in: Document preprocessing. * testsuite/parseok/fourteen.stp: New test. --- configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 88e68f06..3d7d81ef 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,8 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) +CPPFLAGS="$CPPFLAGS -I/usr/include/rpm" +AC_SUBST(CPPFLAGS) dnl Need libdwfl-capable recent elfutils from Fedora save_LIBS="$LIBS" @@ -30,6 +32,12 @@ stap_LIBS="$LIBS" LIBS="$SAVE_LIBS" AC_SUBST(stap_LIBS) +dnl Need rpmlib for rpmvercmp +AC_CHECK_HEADERS([rpmlib.h],,[ + AC_MSG_ERROR([systemtap requires rpmlib.h])]) +AC_CHECK_LIB([rpm], [rpmvercmp],,[ + AC_MSG_ERROR([systemtap requires librpm])]) + dnl Plop in the build (configure) date date=`date +%Y-%m-%d` AC_DEFINE_UNQUOTED(DATE, "$date", [Configuration/build date]) -- cgit