From 69e4bcd9d42e828b1d77584947156606289f1e38 Mon Sep 17 00:00:00 2001 From: guanglei Date: Tue, 10 Oct 2006 09:53:54 +0000 Subject: * runtime/lket/b2a/lket_b2a.c, runtime/lket/b2a/lket_b2a.h: Adding the support of automatically database creation and dumping lket trace into mysql database * configure.ac: add the checking of mysql client library * Makefile.in, configure: regenerated * runtime/lket/b2a/Makefile.am: add the checking and optional compiling for mysql client library * runtime/lket/b2a/Makefile.in: regenerated --- configure | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 2a93d07b..900c1d62 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB BUILD_ELFUTILS_TRUE BUILD_ELFUTILS_FALSE BUILD_LKET_B2A_TRUE BUILD_LKET_B2A_FALSE stap_LIBS DATE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB BUILD_ELFUTILS_TRUE BUILD_ELFUTILS_FALSE BUILD_LKET_B2A_TRUE BUILD_LKET_B2A_FALSE HAS_MYSQL_TRUE HAS_MYSQL_FALSE stap_LIBS DATE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5225,6 +5225,16 @@ else fi + +if which mysql_config > /dev/null 2>&1; then + HAS_MYSQL_TRUE= + HAS_MYSQL_FALSE='#' +else + HAS_MYSQL_TRUE='#' + HAS_MYSQL_FALSE= +fi + + if ! pkg-config --atleast-version 2.0.0 glib-2.0; then { echo "$as_me:$LINENO: WARNING: glib2-devel is required to build lket-b2a. no glib2-devel found, skip building lket-b2a..." >&5 @@ -5232,6 +5242,14 @@ echo "$as_me: WARNING: glib2-devel is required to build lket-b2a. no glib2-devel found, skip building lket-b2a..." >&2;} fi +if ! which mysql_config > /dev/null 2>&1; then + { echo "$as_me:$LINENO: WARNING: mysqlclient lib is required to build lket-b2a with database support. + no mysqlclient lib is found, skip building lket-b2a with database support..." >&5 +echo "$as_me: WARNING: mysqlclient lib is required to build lket-b2a with database support. + no mysqlclient lib is found, skip building lket-b2a with database support..." >&2;} +fi + + if test $build_elfutils = no; then # Need libdwfl-capable recent elfutils from Fedora save_LIBS="$LIBS" @@ -5475,6 +5493,13 @@ echo "$as_me: error: conditional \"BUILD_LKET_B2A\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAS_MYSQL_TRUE}" && test -z "${HAS_MYSQL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAS_MYSQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAS_MYSQL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -6085,6 +6110,8 @@ s,@BUILD_ELFUTILS_TRUE@,$BUILD_ELFUTILS_TRUE,;t t s,@BUILD_ELFUTILS_FALSE@,$BUILD_ELFUTILS_FALSE,;t t s,@BUILD_LKET_B2A_TRUE@,$BUILD_LKET_B2A_TRUE,;t t s,@BUILD_LKET_B2A_FALSE@,$BUILD_LKET_B2A_FALSE,;t t +s,@HAS_MYSQL_TRUE@,$HAS_MYSQL_TRUE,;t t +s,@HAS_MYSQL_FALSE@,$HAS_MYSQL_FALSE,;t t s,@stap_LIBS@,$stap_LIBS,;t t s,@DATE@,$DATE,;t t s,@LIBOBJS@,$LIBOBJS,;t t -- cgit