From 43498922cd6b61c530b0ed16299805053ebf7e42 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Tue, 30 Dec 2008 12:15:24 -0500 Subject: COnfigure nss and nspr using PKG_CHECK_MODULES. --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b413293..606da4a2 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,9 @@ if test "$enable_docs" == "yes"; then fi AM_CONDITIONAL([BUILD_DOCS], [test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"]) +PKG_CHECK_MODULES([nss],[nss >= 3]) +PKG_CHECK_MODULES([nspr],[nspr >= 4]) + dnl Handle elfutils. If '--with-elfutils=DIR' wasn't specified, used dnl the system's elfutils. build_elfutils=no -- cgit From e016a49a83276fc061df86b1b4d72ec8c4efdd29 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 31 Dec 2008 14:41:29 -0500 Subject: build: make compatible with elfutils 0.138 too --- configure.ac | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 606da4a2..f979f8e4 100644 --- a/configure.ac +++ b/configure.ac @@ -223,13 +223,6 @@ AC_LANG_PUSH(C++) AC_CHECK_HEADERS([tr1/unordered_map]) AC_LANG_POP(C++) -AC_CONFIG_HEADERS([config.h:config.in]) -AC_CONFIG_FILES(Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 stap-server.8 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.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) -AC_CONFIG_SUBDIRS(testsuite) - -AC_CONFIG_FILES([run-stap], [chmod +x run-stap]) - -AC_OUTPUT if test $build_elfutils = yes; then case "$with_elfutils" in @@ -250,10 +243,22 @@ if test $build_elfutils = yes; then --exec-prefix="$exec_prefix" \ --prefix="$prefix" \ CFLAGS="${CFLAGS/-Wall/}" \ - LDFLAGS="$LDFLAGS $elfutils_rpath" + LDFLAGS="$LDFLAGS $elfutils_rpath" && + make install-data # so that elfutils/version.h - if any - may be found. ) fi +save_CPPFLAGS=${CPPFLAGS} +CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils +AC_CHECK_HEADERS([elfutils/version.h]) +CPPFLAGS="$save_CPPFLAGS" + +AC_CONFIG_HEADERS([config.h:config.in]) +AC_CONFIG_FILES(Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 stap-server.8 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.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) +AC_CONFIG_SUBDIRS(testsuite) +AC_CONFIG_FILES([run-stap], [chmod +x run-stap]) +AC_OUTPUT + if test "${prefix}" = "/usr/local"; then AC_MSG_NOTICE([]) AC_MSG_NOTICE([For a private or temporary build of systemtap, we recommend]) -- cgit From 19a0d4b6065735b884430e3c15160997606794f1 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 7 Jan 2009 16:36:14 +0100 Subject: Add --enable-server configure option. --- configure.ac | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f979f8e4..bf5b9d5d 100644 --- a/configure.ac +++ b/configure.ac @@ -161,8 +161,23 @@ if test "$enable_docs" == "yes"; then fi AM_CONDITIONAL([BUILD_DOCS], [test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"]) -PKG_CHECK_MODULES([nss],[nss >= 3]) -PKG_CHECK_MODULES([nspr],[nspr >= 4]) +dnl Handle the option to build the server setup. +AC_ARG_ENABLE([server], + AS_HELP_STRING([--enble-server], + [enable building of stap-server/client (default on if nss etc. found).]), + [enable_server=$enableval], + [enable_server="check"]) +PKG_CHECK_MODULES([nss],[nss >= 3], have_nss=yes, have_nss=no) +PKG_CHECK_MODULES([nspr],[nspr >= 4], have_nspr=yes, have_nspr=no) +if test "x${have_nss}${have_nspr}" != "xyesyes"; then + if test "$enable_server" == "yes"; then + AC_MSG_ERROR([cannot find all libraries for stap-server]) + fi + if test "$enable_server" == "check"; then + AC_MSG_WARN([will not build stap-server, cannot find all libraries]) + fi +fi +AM_CONDITIONAL([BUILD_SERVER], [test "x${have_nss}${have_nspr}" == "xyesyes" -a "$enable_server" != "no"]) dnl Handle elfutils. If '--with-elfutils=DIR' wasn't specified, used dnl the system's elfutils. -- cgit From 2d4b8ddfb72206a2e0fc4b500e54602a1f6ba189 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 7 Jan 2009 16:44:02 +0100 Subject: Warn when not building docs because tools not found. --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bf5b9d5d..95be829e 100644 --- a/configure.ac +++ b/configure.ac @@ -154,10 +154,13 @@ AC_CHECK_PROG(have_latex, latex, yes, no) AC_CHECK_PROG(have_dvips, dvips, yes, no) AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no) AC_CHECK_PROG(have_latex2html, latex2html, yes, no) -if test "$enable_docs" == "yes"; then - if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then +if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then + if test "$enable_docs" == "yes"; then AC_MSG_ERROR([cannot find all tools for building documentation]) fi + if test "$enable_docs" == "check"; then + AC_MSG_WARN([will not build documentation, cannot find all tools]) + fi fi AM_CONDITIONAL([BUILD_DOCS], [test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"]) -- cgit From 92aff3c7556ad0f968ff97d5755e4a6488eb80a8 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 7 Jan 2009 12:13:50 -0500 Subject: Check xmlto available and allow user to control generation of reference docs. --- configure.ac | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 95be829e..4cb2948a 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,7 @@ AC_ARG_ENABLE([crash], AM_CONDITIONAL([BUILD_CRASHMOD], [test "$enable_crash" != "no"]) dnl Handle the option to build the documentation +building_docs="no" AC_ARG_ENABLE([docs], AS_HELP_STRING([--enable-docs], [enable building documentation (default on if latex etc. found).]), @@ -162,7 +163,31 @@ if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesye AC_MSG_WARN([will not build documentation, cannot find all tools]) fi fi -AM_CONDITIONAL([BUILD_DOCS], [test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"]) +if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"; then + building_docs="yes" +fi +AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"]) + +dnl Handle the option to build the reference documentation +building_refdocs="no" +AC_ARG_ENABLE([refdocs], + AS_HELP_STRING([--enable-refdocs], + [enable building reference documentation (default on if xmlto etc. found and other documentation built).]), + [enable_refdocs=$enableval], + [enable_refdocs="check"]) +if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then + AC_MSG_ERROR([must use --enable-docs with --enable-refdocs]) +fi +AC_CHECK_PROG(have_xmlto, xmlto, yes, no) +if test "$enable_refdocs" == "yes"; then + if test "x${have_xmlto}" != "xyes"; then + AC_MSG_ERROR([cannot find xmlto for building reference documentation]) + fi +fi +if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then + building_refdocs="yes" +fi +AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], -- cgit From aa5951be9f4f12139cdcec4a501754a62b88c28b Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Thu, 8 Jan 2009 14:28:15 -0500 Subject: Check for xmlto that generates pdf. --- configure.ac | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4cb2948a..7866fe96 100644 --- a/configure.ac +++ b/configure.ac @@ -179,12 +179,29 @@ if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then AC_MSG_ERROR([must use --enable-docs with --enable-refdocs]) fi AC_CHECK_PROG(have_xmlto, xmlto, yes, no) +if test "x${have_xmlto}" == "xyes"; then +AC_MSG_CHECKING([for xmlto pdf support]) +cat > conftest.$ac_ext << EOF + + + + +EOF + xmlto pdf conftest.$ac_ext >& /dev/null + if test $? == 0; then + have_xmlto_pdf="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +fi if test "$enable_refdocs" == "yes"; then - if test "x${have_xmlto}" != "xyes"; then - AC_MSG_ERROR([cannot find xmlto for building reference documentation]) + if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then + AC_MSG_ERROR([cannot find proper yxmlto for building reference documentation]) fi fi -if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then +if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then building_refdocs="yes" fi AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) -- cgit From 50431f30cac19c57f53bdfe0fd138cdc2dcfa2f9 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 11 Jan 2009 14:37:28 +0100 Subject: Pick up --prefix dependency usage in config.h. --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7866fe96..7e705811 100644 --- a/configure.ac +++ b/configure.ac @@ -313,6 +313,12 @@ CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils AC_CHECK_HEADERS([elfutils/version.h]) CPPFLAGS="$save_CPPFLAGS" +dnl This is here mainly to make sure that configure --prefix=... changes +dnl the config.h files so files depending on it are recompiled +dnl prefix is passed through indirectly in the Makefile.am AM_CPPFLAGS. +dnl Don't use this directly (when not given it is set to NONE). +AC_DEFINE_UNQUOTED(STAP_PREFIX, "$prefix", [configure prefix location]) + AC_CONFIG_HEADERS([config.h:config.in]) AC_CONFIG_FILES(Makefile doc/Makefile doc/SystemTap_Tapset_Reference/Makefile stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 stap-server.8 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.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5) AC_CONFIG_SUBDIRS(testsuite) -- cgit From 1c4cf93d166d146262afcf3df69a8f1b0a9c2ee2 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 21 Jan 2009 14:32:14 +0100 Subject: Only muck with CPPFLAGS when actually building with bundled elfutils. --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7e705811..dd0e40eb 100644 --- a/configure.ac +++ b/configure.ac @@ -306,13 +306,14 @@ if test $build_elfutils = yes; then LDFLAGS="$LDFLAGS $elfutils_rpath" && make install-data # so that elfutils/version.h - if any - may be found. ) + save_CPPFLAGS=${CPPFLAGS} + CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils + AC_CHECK_HEADERS([elfutils/version.h]) + CPPFLAGS="$save_CPPFLAGS" +else + AC_CHECK_HEADERS([elfutils/version.h]) fi -save_CPPFLAGS=${CPPFLAGS} -CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils -AC_CHECK_HEADERS([elfutils/version.h]) -CPPFLAGS="$save_CPPFLAGS" - dnl This is here mainly to make sure that configure --prefix=... changes dnl the config.h files so files depending on it are recompiled dnl prefix is passed through indirectly in the Makefile.am AM_CPPFLAGS. -- cgit From 5574ef2ce9549c89f91e9c8dccc41fc0e85a74d6 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 21 Jan 2009 23:23:51 +0100 Subject: Create PIECFLAGS and PIECXXFLAGS, like PIELDFLAGS. --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index dd0e40eb..fb931319 100644 --- a/configure.ac +++ b/configure.ac @@ -94,15 +94,23 @@ AS_IF([test "x$enable_pie" != xno],[ AC_MSG_NOTICE([Compiling with gcc pie et al.]) # LDFLAGS is special since it may be passed down to bundled-elfutils, # and interfere with the .so's built therein - PIELDFLAGS="$LDFLAGS -pie -Wl,-z,relro -Wl,-z,now" + PIELDFLAGS="$LDFLAGS" LDFLAGS="$save_LDFLAGS" + PIECFLAGS="$CFLAGS" + CFLAGS="$save_CFLAGS" + PIECXXFLAGS="$CXXFLAGS" + CXXFLAGS="$save_CXXFLAGS" ],[ AC_MSG_NOTICE([Compiler does not support -pie et al.]) + PIECFLAGS="" CFLAGS="$save_CFLAGS" + PIECXXFLAGS="" CXXFLAGS="$save_CXXFLAGS" PIELDFLAGS="" LDFLAGS="$save_LDFLAGS"])]) AC_SUBST(PIELDFLAGS) +AC_SUBST(PIECFLAGS) +AC_SUBST(PIECXXFLAGS) dnl Handle optional sqlite support. If enabled/disabled by the user, dnl do the right thing. If not specified by the user, use it if -- cgit From 6275c8d707229558487e2927f1f9940a9d237fbe Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 22 Jan 2009 15:40:44 -0600 Subject: 2009-01-22 David Smith * systemtap.spec: Added 'nss-devel' buildreq so that the 'client' subpackage could be built correctly. Added file-based buildreq for xmlto's pdf support, which works on f8, f9, f9, and rhel5. * configure.ac: Fixed typo. * configure: Regenerated. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fb931319..7b9afb89 100644 --- a/configure.ac +++ b/configure.ac @@ -216,7 +216,7 @@ AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], - AS_HELP_STRING([--enble-server], + AS_HELP_STRING([--enable-server], [enable building of stap-server/client (default on if nss etc. found).]), [enable_server=$enableval], [enable_server="check"]) -- cgit From f120873cb40cfc16cc94f06fd722abc927b96227 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 23 Jan 2009 11:25:44 +0100 Subject: Use make -k install-data for elfutils. --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b9afb89..3e0efc95 100644 --- a/configure.ac +++ b/configure.ac @@ -312,7 +312,10 @@ if test $build_elfutils = yes; then --prefix="$prefix" \ CFLAGS="${CFLAGS/-Wall/}" \ LDFLAGS="$LDFLAGS $elfutils_rpath" && - make install-data # so that elfutils/version.h - if any - may be found. + make -k install-data # so that elfutils/version.h - if any - may be found. + # Note, we need -k because parts (like to po files) might fail, + # since those fo to $prefix to which we might not be able to write. + # We are only really interested in the include-elfutils files anyway here. ) save_CPPFLAGS=${CPPFLAGS} CPPFLAGS="${CPPFLAGS} -Iinclude-elfutils" # in case bundled elfutils -- cgit