diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 65 |
1 files changed, 42 insertions, 23 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for systemtap 0.6. +# Generated by GNU Autoconf 2.61 for systemtap 0.6.1. # # Report bugs to <systemtap@sources.redhat.com>. # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='systemtap' PACKAGE_TARNAME='systemtap' -PACKAGE_VERSION='0.6' -PACKAGE_STRING='systemtap 0.6' +PACKAGE_VERSION='0.6.1' +PACKAGE_STRING='systemtap 0.6.1' PACKAGE_BUGREPORT='systemtap@sources.redhat.com' # Factoring default headers for most tests. @@ -1233,7 +1233,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemtap 0.6 to adapt to many kinds of systems. +\`configure' configures systemtap 0.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1299,7 +1299,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemtap 0.6:";; + short | recursive ) echo "Configuration of systemtap 0.6.1:";; esac cat <<\_ACEOF @@ -1313,6 +1313,7 @@ Optional Features: --enable-perfmon enable perfmon support (default is disabled) --enable-prologues make -P prologue-searching default --enable-ssp enable gcc stack-protector + --enable-sqlite build with sqlite support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1398,7 +1399,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemtap configure 0.6 +systemtap configure 0.6.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1412,7 +1413,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemtap $as_me 0.6, which was +It was created by systemtap $as_me 0.6.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1767,7 +1768,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - am__api_version='1.10' ac_aux_dir= @@ -2105,7 +2105,7 @@ fi # Define the identity of the package. PACKAGE='systemtap' - VERSION='0.6' + VERSION='0.6.1' cat >>confdefs.h <<_ACEOF @@ -5823,8 +5823,6 @@ fi - - # Check whether --enable-perfmon was given. if test "${enable_perfmon+set}" = set; then enableval=$enable_perfmon; perfmon_support=$enableval @@ -5959,10 +5957,28 @@ 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" + CXXFLAGS="$CXXFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2" + { 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;} +fi -SAVE_LIBS="$LIBS" -{ echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5 +# Check whether --enable-sqlite was given. +if test "${enable_sqlite+set}" = set; then + enableval=$enable_sqlite; +else + enable_sqlite=check +fi + sqlite3_LIBS= +if test "x$enable_sqlite" != xno; then + { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5 echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; } if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6024,17 +6040,19 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5 echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSQLITE3 1 -_ACEOF - - LIBS="-lsqlite3 $LIBS" + sqlite3_LIBS=-lsqlite3 +else + if test "x$enable_sqlite" != xcheck; then + { { echo "$as_me:$LINENO: error: --enable-sqlite was given, but test for sqlite failed +See \`config.log' for more details." >&5 +echo "$as_me: error: --enable-sqlite was given, but test for sqlite failed +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi fi -sqlite3_LIBS="$LIBS" - -LIBS="$SAVE_LIBS" +fi # Check whether --enable-ssp was given. @@ -6454,6 +6472,7 @@ echo "$as_me: error: missing elfutils development headers/libraries (ebl 0.123+) { (exit 1); exit 1; }; } fi + stap_LIBS="$LIBS" LIBS="$SAVE_LIBS" else @@ -7031,7 +7050,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by systemtap $as_me 0.6, which was +This file was extended by systemtap $as_me 0.6.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7084,7 +7103,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -systemtap config.status 0.6 +systemtap config.status 0.6.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |