From 0760668552a05a25bc09055ca35b0585c206fd25 Mon Sep 17 00:00:00 2001 From: dsmith Date: Mon, 28 Jan 2008 15:08:58 +0000 Subject: 2008-01-28 David Smith PR 5685. From Eugeniy Meshcheryakov * configure.ac: If "--enable-sqlite" is specified, define HAVE_LIBSQLITE3. * configure: Regenerated. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f5fcc968..8ce6da11 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,8 @@ AC_ARG_ENABLE([sqlite], sqlite3_LIBS= AS_IF([test "x$enable_sqlite" != xno], [AC_CHECK_LIB([sqlite3], [sqlite3_open], - [AC_SUBST([sqlite3_LIBS], [-lsqlite3])], + [AC_SUBST([sqlite3_LIBS], [-lsqlite3]) + AC_DEFINE([HAVE_LIBSQLITE3])], [if test "x$enable_sqlite" != xcheck; then AC_MSG_FAILURE([--enable-sqlite was given, but test for sqlite failed]) fi])]) -- cgit From 564eb0a8ce73a298715c94e02988a29c2064a4ad Mon Sep 17 00:00:00 2001 From: dsmith Date: Mon, 28 Jan 2008 21:15:28 +0000 Subject: 2008-01-28 David Smith * configure.ac: Fixed a bug when "--disable-permon" was used. Added "--enable-crash" option. * configure: Regenerated. * Makefile.am: Improved staplog.so compile command. * Makefile.in: Regenerated. --- configure.ac | 52 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 18 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8ce6da11..445b592f 100644 --- a/configure.ac +++ b/configure.ac @@ -30,19 +30,18 @@ AC_ARG_ENABLE([perfmon], [enable perfmon support (default is disabled). Optional DIRECTORY is the path to the perfmon installation (needed if installed in a non-standard location).]), [ - dnl Add perfmon define and library - CFLAGS="$CFLAGS -DPERFMON" - CXXFLAGS="$CXXFLAGS -DPERFMON" - LIBS="$LIBS -lpfm" - dnl Handle custom install dir (if needed) - if test "$enable_perfmon" != "yes"; then - CFLAGS="$CFLAGS -I$enable_perfmon/include" - CXXFLAGS="$CXXFLAGS -I$enable_perfmon/include" - LDFLAGS="$LDFLAGS -L$enable_perfmon/lib" - fi - AC_CHECK_LIB([pfm], [pfm_start], [], [ - AC_MSG_ERROR([systemtap cannot find required perfmon libs])]) -]) + if test "$enable_perfmon" != "no"; then + dnl Add perfmon define and library + CPPFLAGS="$CPPFLAGS -DPERFMON" + LIBS="$LIBS -lpfm" + dnl Handle custom install dir (if needed) + if test "$enable_perfmon" != "yes"; then + CPPFLAGS="$CPPFLAGS -I$enable_perfmon/include" + LDFLAGS="$LDFLAGS -L$enable_perfmon/lib" + fi + AC_CHECK_LIB([pfm], [pfm_start], [], [ + AC_MSG_ERROR([systemtap cannot find required perfmon libs (libpfm-devel may need to be installed])]) + fi]) dnl Handle the prologues option. dnl @@ -91,12 +90,29 @@ AS_IF([test "x$enable_sqlite" != xno], AC_MSG_FAILURE([--enable-sqlite was given, but test for sqlite failed]) fi])]) -AC_CHECK_HEADERS(crash/defs.h, - build_crashmod=yes,build_crashmod=no, - [ +dnl Handle the option to build the crash extension +AC_ARG_ENABLE([crash], + AS_HELP_STRING([--enable-crash@<:@=DIRECTORY@:>@], + [enable crash extension (default is disabled). Optional DIRECTORY + is the path to the crash header file (needed if installed in a + non-standard location).]), + [if test "$enable_crash" != "no"; then + dnl Handle custom install dir (if needed) + save_CPPFLAGS="$CPPFLAGS" + if test "$enable_crash" != "yes"; then + staplog_CPPFLAGS=-I$enable_crash + CPPFLAGS="${staplog_CPPFLAGS} $CPPFLAGS" + AC_SUBST([staplog_CPPFLAGS]) + fi + AC_CHECK_HEADERS([crash/defs.h], [], + [AC_MSG_ERROR([cannot find required crash header (crash-devel may need to be installed)])], + [ #define NR_CPUS 256 -]) -AM_CONDITIONAL(BUILD_CRASHMOD, test $build_crashmod = yes) + ]) + CPPFLAGS="$save_CPPFLAGS" + fi], + [enable_crash="no"]) +AM_CONDITIONAL([BUILD_CRASHMOD], [test "$enable_crash" != "no"]) AC_CHECK_HEADERS([sys/capability.h], , [AC_MSG_ERROR([cannot find required libcap header (libcap-devel may need to be installed)])]) -- cgit From bbfd8c1a59001a26cf04c34a97b247fbab9a5bad Mon Sep 17 00:00:00 2001 From: fche Date: Tue, 29 Jan 2008 15:36:16 +0000 Subject: PR5647: build with -fstack-protector-all by default 2008-01-29 Frank Ch. Eigler PR 5647 * configure.ac (--enable-ssp): Make default on compilers that support it. * configure: Regenerated. --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 445b592f..d8a7d38c 100644 --- a/configure.ac +++ b/configure.ac @@ -66,13 +66,18 @@ if test "$enable_prologues" = yes; then AC_DEFINE([ENABLE_PROLOGUES],[],[make -P prologue-searching default]) fi]) - AC_ARG_ENABLE([ssp], - [AS_HELP_STRING([--enable-ssp], [enable gcc stack-protector])]) -AS_IF([test "x$enable_ssp" == xyes], - [CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + [AS_HELP_STRING([--disable-ssp], [disable gcc stack-protector])]) +AS_IF([test "x$enable_ssp" != xno],[ + save_CFLAGS="$CFLAGS" + save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" - AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])]) + CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + AC_COMPILE_IFELSE([int something ();], [ + AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])], [ + AC_MSG_NOTICE([Compiler does not support -fstack-protector-all et al.]) + CFLAGS="$save_CFLAGS" + CXXFLAGS="$save_CXXFLAGS"])]) 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 f0510eaae21d50a6f966a7ce0189d6c333d670d8 Mon Sep 17 00:00:00 2001 From: fche Date: Sat, 9 Feb 2008 23:36:23 +0000 Subject: PR5751, -Werror emphasis on -fstack-protector-all trial build 2008-02-09 Frank Ch. Eigler PR 5751. * configure.ac: Add -Werror to trial compilation with -fstack-protector-all, for hosts that don't quite support it. * configure: Regenerated. --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d8a7d38c..a486b6b4 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,12 @@ AC_ARG_ENABLE([ssp], AS_IF([test "x$enable_ssp" != xno],[ save_CFLAGS="$CFLAGS" save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" - CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + CXXFLAGS="$CXXFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -Werror -fstack-protector-all -D_FORTIFY_SOURCE=2" AC_COMPILE_IFELSE([int something ();], [ - AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])], [ + AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.]) + CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + CXFXLAGS="$save_CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"],[ AC_MSG_NOTICE([Compiler does not support -fstack-protector-all et al.]) CFLAGS="$save_CFLAGS" CXXFLAGS="$save_CXXFLAGS"])]) -- cgit From 0d563e601674c51788b35103da6d004450833541 Mon Sep 17 00:00:00 2001 From: fche Date: Sun, 10 Feb 2008 00:28:54 +0000 Subject: PR5750: autoreconf compatibility 2008-02-09 Frank Ch. Eigler PR5750. From Eugeniy Meshcheryakov eugen@debian.org: * configure.ac (HAVE_LIBSQLITE3): Complete AC_DEFINE. * configure, INSTALL, missing, compile, depcomp, install-sh: autoreconf -fi'd. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a486b6b4..990245a9 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ sqlite3_LIBS= AS_IF([test "x$enable_sqlite" != xno], [AC_CHECK_LIB([sqlite3], [sqlite3_open], [AC_SUBST([sqlite3_LIBS], [-lsqlite3]) - AC_DEFINE([HAVE_LIBSQLITE3])], + AC_DEFINE([HAVE_LIBSQLITE3], [1], [Define to 1 if you have the `sqlite3' library (-lsqlite3).])], [if test "x$enable_sqlite" != xcheck; then AC_MSG_FAILURE([--enable-sqlite was given, but test for sqlite failed]) fi])]) -- cgit