+2006-10-10 Frank Ch. Eigler <fche@elastic.org>
+
+ * configure.ac: Override incomplete mysql checking for now.
+ * configure: Regenerated.
+
2006-10-10 Li Guanglei <guanglei@cn.ibm.com>
* configure.ac: add the checking of mysql client library
* Makefile.in, configure: regenerated
+
2006-09-29 Li Guanglei <guanglei@cn.ibm.com>
* man: newly created dir for stapprobes
fi
+# This check is not sufficient. mysql_config may exist on machines
+# that do not actually have the development headers/libraries installed.
+# AM_CONDITIONAL(HAS_MYSQL, which mysql_config > /dev/null 2>&1)
-if which mysql_config > /dev/null 2>&1; then
+
+if false; then
HAS_MYSQL_TRUE=
HAS_MYSQL_FALSE='#'
else
no glib2-devel found, skip building lket-b2a..." >&2;}
fi
+# AC_CHECK_LIB
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
esac])
AM_CONDITIONAL(BUILD_ELFUTILS, test $build_elfutils = yes)
AM_CONDITIONAL(BUILD_LKET_B2A, pkg-config --atleast-version 2.0.0 glib-2.0)
-AM_CONDITIONAL(HAS_MYSQL, which mysql_config > /dev/null 2>&1)
+
+# This check is not sufficient. mysql_config may exist on machines
+# that do not actually have the development headers/libraries installed.
+# AM_CONDITIONAL(HAS_MYSQL, which mysql_config > /dev/null 2>&1)
+AM_CONDITIONAL(HAS_MYSQL, false)
if ! pkg-config --atleast-version 2.0.0 glib-2.0; then
AC_MSG_WARN([glib2-devel is required to build lket-b2a.
no glib2-devel found, skip building lket-b2a...])
fi
+# AC_CHECK_LIB
if ! which mysql_config > /dev/null 2>&1; then
AC_MSG_WARN([mysqlclient lib is required to build lket-b2a with database support.
no mysqlclient lib is found, skip building lket-b2a with database support...])
+2006-10-10 Frank Ch. Eigler <fche@elastic.org>
+
+ * runtime/lket/b2a/lket_b2a.c: Add several missing #ifdef HAS_MYSQL.
+
2006-10-10 Li Guanglei <guanglei@cn.ibm.com>
* runtime/lket/b2a/lket_b2a.c, runtime/lket/b2a/lket_b2a.h:
// Copyright (C) 2005, 2006 IBM Corp.
+// Copyright (C) 2006 Red Hat Inc.
//
// This file is part of systemtap, and is free software. You can
// redistribute it and/or modify it under the terms of the GNU General
exit(-1);
}
}
-#endif
if(events_des[1][i][j]->entrytime) /* destroy entrytime tree */
g_tree_destroy(events_des[1][i][j]->entrytime);
+#endif
}
}
void register_evt_desc(FILE *infp, size_t size)
{
+#ifdef HAS_MYSQL
static int has_table = 0;
+#endif
int grpid, hookid;
char *evt_body;
evt_body = malloc(size);
if(!events_des[1][grpid][hookid])
events_des[1][grpid][hookid] = malloc(sizeof(event_desc));
+#ifdef HAS_MYSQL
events_des[1][grpid][hookid]->entrytime = g_tree_new_full(
compareFunc, NULL, NULL, destroyTreeData);
-#ifdef HAS_MYSQL
if(into_db) {
if(!has_table) {
snprintf(sql, 1024, "create table table_desc ( table_name \
snprintf(sql, 1024, "alter table %d_%d ", grpid, hookid);
}
}
-#endif
if(size == 2) // skip if no event format is provided
goto gen_sql;
+#endif
evt_fmt = evt_body+2;