From 35495a4544e1b61ecd37930a1870cddc2aba093f Mon Sep 17 00:00:00 2001
From: guanglei <guanglei>
Date: Fri, 20 Oct 2006 09:41:15 +0000
Subject: [PATCH] Change warning message from configure for mysql

---
 configure                    | 16 ++++++++--------
 configure.ac                 | 10 +++++-----
 runtime/lket/b2a/Makefile.in |  1 +
 testsuite/Makefile.in        |  1 +
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 088242f25..ee4839475 100755
--- a/configure
+++ b/configure
@@ -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 93dbec198..6e0238d12 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 c4eb730f4..91a7efc69 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 e40a6139b..fc2d0ee37 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@
-- 
2.43.5