1 diff -Nur systemtap-0.5.11.orig/src/configure.ac systemtap-0.5.11.as-needed/src/configure.ac
2 --- systemtap-0.5.11.orig/src/configure.ac 2006-11-09 18:01:31.000000000 +0000
3 +++ systemtap-0.5.11.as-needed/src/configure.ac 2007-05-19 17:07:35.000000000 +0000
5 AC_MSG_ERROR([systemtap cannot find required perfmon libs])])
6 CFLAGS="$CFLAGS -DPERFMON -I$with_perfmon/include"
7 CXXFLAGS="$CXXFLAGS -DPERFMON -I$with_perfmon/include"
8 - LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib -lpfm"
9 + LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib"
16 SAVE_CPPFLAGS=$CPPFLAGS
19 AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
20 if test "$MYSQL_CONFIG" = "no"; then
21 AC_MSG_NOTICE([*** Cannot find mysql_config executable. Guess MySQL compiling flags.])
23 LDFLAGS="-L/usr/lib/mysql $LDFLAGS -L/usr/lib64/mysql"
25 CPPFLAGS="`mysql_config --cflags` $CPPFLAGS"
26 - LDFLAGS="`mysql_config --libs` $LDFLAGS"
27 + MYSQL_LIBS="`mysql_config --libs`"
28 +# LIBS="`mysql_config --libs` $LIBS"
32 AC_CHECK_HEADERS(mysql/mysql.h,
33 AC_CHECK_LIB(mysqlclient, mysql_init,
36 CPPFLAGS=$SAVE_CPPFLAGS
39 if ! pkg-config --atleast-version 2.0.0 glib-2.0; then
40 AC_MSG_WARN([glib2-devel is required to build lket-b2a.
41 no glib2-devel found, skip building lket-b2a...])
43 + GLIB2_LIBS=`pkg-config --libs glib-2.0`
47 if test $build_elfutils = no; then
48 # Need libdwfl-capable recent elfutils from Fedora
49 diff -Nur systemtap-0.5.11.orig/src/runtime/lket/b2a/Makefile.am systemtap-0.5.11.as-needed/src/runtime/lket/b2a/Makefile.am
50 --- systemtap-0.5.11.orig/src/runtime/lket/b2a/Makefile.am 2006-10-16 08:36:35.000000000 +0000
51 +++ systemtap-0.5.11.as-needed/src/runtime/lket/b2a/Makefile.am 2007-05-19 17:06:30.000000000 +0000
53 bin_PROGRAMS = lket-b2a
54 lket_b2a_SOURCES = lket_b2a.c
55 lket_b2a_DEPENDENCIES = lket_b2a.h
56 -lket_b2a_LDFLAGS = `pkg-config --libs glib-2.0`
57 +lket_b2a_LDADD = @GLIB2_LIBS@
58 lket_b2a_CFLAGS = -O2 -D_GNU_SOURCE -Wall `pkg-config --cflags glib-2.0`
61 lket_b2a_CFLAGS += -DHAS_MYSQL
63 -lket_b2a_LDFLAGS += `mysql_config --libs`
64 +lket_b2a_LDADD += @MYSQL_LIBS@
65 lket_b2a_CFLAGS += `mysql_config --cflags`
67 lket_b2a_CFLAGS += -I/usr/include/mysql -g -pipe -fsigned-char -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing
68 -lket_b2a_LDFLAGS += -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -L/usr/lib -lssl -lcrypto
69 +lket_b2a_LDADD += -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -L/usr/lib -lssl -lcrypto