diff options
| author | guanglei <guanglei> | 2006-10-20 09:41:15 +0000 |
|---|---|---|
| committer | guanglei <guanglei> | 2006-10-20 09:41:15 +0000 |
| commit | 35495a4544e1b61ecd37930a1870cddc2aba093f (patch) | |
| tree | ecab8e208b87429cd08ca9d6d38cfd7249102974 | |
| parent | 24cb8c3b07c5fed086555b54f9f753bb78df6837 (diff) | |
| download | systemtap-steved-35495a4544e1b61ecd37930a1870cddc2aba093f.tar.gz systemtap-steved-35495a4544e1b61ecd37930a1870cddc2aba093f.tar.xz systemtap-steved-35495a4544e1b61ecd37930a1870cddc2aba093f.zip | |
Change warning message from configure for mysql
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | runtime/lket/b2a/Makefile.in | 1 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 1 |
4 files changed, 15 insertions, 13 deletions
@@ -5239,7 +5239,7 @@ fi mysql=false SAVE_LDFLAGS=$LDFLAGS -SAVE_CPPFLAGS=$CPPFLAG +SAVE_CPPFLAGS=$CPPFLAGS # Extract the first word of "mysql_config", so it can be a program name with args. set dummy mysql_config; ac_word=$2 @@ -5282,8 +5282,8 @@ echo "${ECHO_T}no" >&6 fi if test "$MYSQL_CONFIG" = "no"; then - { echo "$as_me:$LINENO: *** Cannot find mysql_config executable. Check your MySQL installation." >&5 -echo "$as_me: *** Cannot find mysql_config executable. Check your MySQL installation." >&6;} + { echo "$as_me:$LINENO: *** Cannot find mysql_config executable. Guess MySQL compiling flags." >&5 +echo "$as_me: *** Cannot find mysql_config executable. Guess MySQL compiling flags." >&6;} CPPFLAGS="-I/usr/include/mysql $CPPFLAGS" LDFLAGS="-L/usr/lib/mysql $LDFLAGS -L/usr/lib64/mysql" else @@ -5734,13 +5734,13 @@ echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_init" >&6 if test $ac_cv_lib_mysqlclient_mysql_init = yes; then mysql=true else - { echo "$as_me:$LINENO: *** Cannot find mysqlclient lib. Check your MySQL installation." >&5 -echo "$as_me: *** Cannot find mysqlclient lib. Check your MySQL installation." >&6;} + { echo "$as_me:$LINENO: *** Cannot find mysqlclient lib. lket-b2a will be built without MySQL support." >&5 +echo "$as_me: *** Cannot find mysqlclient lib. lket-b2a will be built without MySQL support." >&6;} fi else - { echo "$as_me:$LINENO: *** Cannot find mysql header file. Check your MySQL installation." >&5 -echo "$as_me: *** Cannot find mysql header file. Check your MySQL installation." >&6;} + { echo "$as_me:$LINENO: *** Cannot find mysql header file. lket-b2a will be built without MySQL support." >&5 +echo "$as_me: *** Cannot find mysql header file. lket-b2a will be built without MySQL support." >&6;} fi done @@ -5768,7 +5768,7 @@ fi LDFLAGS=$SAVE_LDFLAGS -CPPFLAG=$SAVE_CPPFLAGS +CPPFLAGS=$SAVE_CPPFLAGS 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. diff --git a/configure.ac b/configure.ac index 93dbec19..6e0238d1 100644 --- a/configure.ac +++ b/configure.ac @@ -67,11 +67,11 @@ AM_CONDITIONAL(BUILD_LKET_B2A, pkg-config --atleast-version 2.0.0 glib-2.0) mysql=false SAVE_LDFLAGS=$LDFLAGS -SAVE_CPPFLAGS=$CPPFLAG +SAVE_CPPFLAGS=$CPPFLAGS AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) if test "$MYSQL_CONFIG" = "no"; then - AC_MSG_NOTICE([*** Cannot find mysql_config executable. Check your MySQL installation.]) + AC_MSG_NOTICE([*** Cannot find mysql_config executable. Guess MySQL compiling flags.]) CPPFLAGS="-I/usr/include/mysql $CPPFLAGS" LDFLAGS="-L/usr/lib/mysql $LDFLAGS -L/usr/lib64/mysql" else @@ -82,14 +82,14 @@ fi AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient, mysql_init, mysql=true, - AC_MSG_NOTICE([*** Cannot find mysqlclient lib. Check your MySQL installation.]), []), - AC_MSG_NOTICE([*** Cannot find mysql header file. Check your MySQL installation.]), []) + AC_MSG_NOTICE([*** Cannot find mysqlclient lib. lket-b2a will be built without MySQL support.]), []), + AC_MSG_NOTICE([*** Cannot find mysql header file. lket-b2a will be built without MySQL support.]), []) AM_CONDITIONAL(HAS_MYSQL, test "$mysql" = "true") AM_CONDITIONAL(HAS_MYSQL_CONFIG, test "$MYSQL_CONFIG" != "no") LDFLAGS=$SAVE_LDFLAGS -CPPFLAG=$SAVE_CPPFLAGS +CPPFLAGS=$SAVE_CPPFLAGS if ! pkg-config --atleast-version 2.0.0 glib-2.0; then AC_MSG_WARN([glib2-devel is required to build lket-b2a. diff --git a/runtime/lket/b2a/Makefile.in b/runtime/lket/b2a/Makefile.in index c4eb730f..91a7efc6 100644 --- a/runtime/lket/b2a/Makefile.in +++ b/runtime/lket/b2a/Makefile.in @@ -145,6 +145,7 @@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ +elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ includedir = @includedir@ diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index e40a6139..fc2d0ee3 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -129,6 +129,7 @@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ +elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ includedir = @includedir@ |