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 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure') diff --git a/configure b/configure index dff77901..0a14c6a5 100755 --- a/configure +++ b/configure @@ -6029,6 +6029,10 @@ echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then sqlite3_LIBS=-lsqlite3 + cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBSQLITE3 1 +_ACEOF + else if test "x$enable_sqlite" != xcheck; then { { echo "$as_me:$LINENO: error: --enable-sqlite was given, but test for sqlite failed -- 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 | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 0a14c6a5..97e625ac 100755 --- a/configure +++ b/configure @@ -706,6 +706,7 @@ U ANSI2KNR RANLIB sqlite3_LIBS +staplog_CPPFLAGS BUILD_CRASHMOD_TRUE BUILD_CRASHMOD_FALSE BUILD_ELFUTILS_TRUE @@ -1318,6 +1319,11 @@ Optional Features: --enable-prologues make -P prologue-searching default --enable-ssp enable gcc stack-protector --enable-sqlite build with sqlite support + --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). Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -5828,14 +5834,13 @@ fi # Check whether --enable-perfmon was given. if test "${enable_perfmon+set}" = set; then enableval=$enable_perfmon; - CFLAGS="$CFLAGS -DPERFMON" - CXXFLAGS="$CXXFLAGS -DPERFMON" - LIBS="$LIBS -lpfm" - 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 + if test "$enable_perfmon" != "no"; then + CPPFLAGS="$CPPFLAGS -DPERFMON" + LIBS="$LIBS -lpfm" + if test "$enable_perfmon" != "yes"; then + CPPFLAGS="$CPPFLAGS -I$enable_perfmon/include" + LDFLAGS="$LDFLAGS -L$enable_perfmon/lib" + fi { echo "$as_me:$LINENO: checking for pfm_start in -lpfm" >&5 echo $ECHO_N "checking for pfm_start in -lpfm... $ECHO_C" >&6; } @@ -5907,12 +5912,12 @@ _ACEOF else - { { echo "$as_me:$LINENO: error: systemtap cannot find required perfmon libs" >&5 -echo "$as_me: error: systemtap cannot find required perfmon libs" >&2;} + { { echo "$as_me:$LINENO: error: systemtap cannot find required perfmon libs (libpfm-devel may need to be installed" >&5 +echo "$as_me: error: systemtap cannot find required perfmon libs (libpfm-devel may need to be installed" >&2;} { (exit 1); exit 1; }; } fi - + fi fi @@ -6046,6 +6051,15 @@ fi fi +# Check whether --enable-crash was given. +if test "${enable_crash+set}" = set; then + enableval=$enable_crash; if test "$enable_crash" != "no"; then + save_CPPFLAGS="$CPPFLAGS" + if test "$enable_crash" != "yes"; then + staplog_CPPFLAGS=-I$enable_crash + CPPFLAGS="${staplog_CPPFLAGS} $CPPFLAGS" + + fi for ac_header in crash/defs.h do @@ -6101,14 +6115,22 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - build_crashmod=yes + else - build_crashmod=no + { { echo "$as_me:$LINENO: error: cannot find required crash header (crash-devel may need to be installed)" >&5 +echo "$as_me: error: cannot find required crash header (crash-devel may need to be installed)" >&2;} + { (exit 1); exit 1; }; } fi done - if test $build_crashmod = yes; then + CPPFLAGS="$save_CPPFLAGS" + fi +else + enable_crash="no" +fi + + if test "$enable_crash" != "no"; then BUILD_CRASHMOD_TRUE= BUILD_CRASHMOD_FALSE='#' else @@ -7370,11 +7392,11 @@ U!$U$ac_delim ANSI2KNR!$ANSI2KNR$ac_delim RANLIB!$RANLIB$ac_delim sqlite3_LIBS!$sqlite3_LIBS$ac_delim +staplog_CPPFLAGS!$staplog_CPPFLAGS$ac_delim BUILD_CRASHMOD_TRUE!$BUILD_CRASHMOD_TRUE$ac_delim BUILD_CRASHMOD_FALSE!$BUILD_CRASHMOD_FALSE$ac_delim BUILD_ELFUTILS_TRUE!$BUILD_ELFUTILS_TRUE$ac_delim BUILD_ELFUTILS_FALSE!$BUILD_ELFUTILS_FALSE$ac_delim -elfutils_abs_srcdir!$elfutils_abs_srcdir$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -7416,6 +7438,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +elfutils_abs_srcdir!$elfutils_abs_srcdir$ac_delim stap_LIBS!$stap_LIBS$ac_delim DATE!$DATE$ac_delim PROCFLAGS!$PROCFLAGS$ac_delim @@ -7425,7 +7448,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -- 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 | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 97e625ac..9d2a90f0 100755 --- a/configure +++ b/configure @@ -1317,7 +1317,7 @@ Optional Features: installation (needed if installed in a non-standard location). --enable-prologues make -P prologue-searching default - --enable-ssp enable gcc stack-protector + --disable-ssp disable gcc stack-protector --enable-sqlite build with sqlite support --enable-crash[=DIRECTORY] enable crash extension (default is disabled). @@ -5948,17 +5948,52 @@ fi fi - # Check whether --enable-ssp was given. if test "${enable_ssp+set}" = set; then enableval=$enable_ssp; fi -if test "x$enable_ssp" == xyes; then - CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" +if test "x$enable_ssp" != xno; then + + save_CFLAGS="$CFLAGS" + save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" - { echo "$as_me:$LINENO: Compiling with gcc -fstack-protector-all et al." >&5 + CFLAGS="$CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + cat >conftest.$ac_ext <<_ACEOF +int something (); +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { echo "$as_me:$LINENO: Compiling with gcc -fstack-protector-all et al." >&5 echo "$as_me: Compiling with gcc -fstack-protector-all et al." >&6;} +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: Compiler does not support -fstack-protector-all et al." >&5 +echo "$as_me: Compiler does not support -fstack-protector-all et al." >&6;} + CFLAGS="$save_CFLAGS" + CXXFLAGS="$save_CXXFLAGS" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -- 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 9d2a90f0..7f002d4e 100755 --- a/configure +++ b/configure @@ -5957,8 +5957,8 @@ if test "x$enable_ssp" != xno; then 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" cat >conftest.$ac_ext <<_ACEOF int something (); _ACEOF @@ -5982,6 +5982,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 { echo "$as_me:$LINENO: Compiling with gcc -fstack-protector-all et al." >&5 echo "$as_me: Compiling with gcc -fstack-protector-all et al." >&6;} + CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + CXFXLAGS="$save_CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -- 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 7f002d4e..47482a7f 100755 --- a/configure +++ b/configure @@ -6071,7 +6071,8 @@ echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then sqlite3_LIBS=-lsqlite3 - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_LIBSQLITE3 1 _ACEOF -- cgit