Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.2
diff -u -p -r1.2 configure.ac
--- configure.ac	23 Feb 2005 18:29:58 -0000	1.2
+++ configure.ac	23 Feb 2005 21:19:36 -0000
@@ -83,15 +83,21 @@ AC_ARG_WITH(mysql,
     [ MYSQL_PREFIX=$with_mysql ],
     [ MYSQL_PREFIX=/usr ])
 
-AC_PATH_PROG(mysqlconfig,mysql_config,,[$PATH:$MYSQL_PREFIX/bin])
+AC_PATH_PROG(mysqlconfig,mysql_config,,[$MYSQL_PREFIX/bin:$PATH])
 if test [ -z "$mysqlconfig" ]
 then
     AC_MSG_ERROR([mysql_config executable not found: MySQL 4.1.0 or greater is required.])
 else
     AC_MSG_CHECKING(mysql libraries)
     MYSQL_VERSION=`${mysqlconfig} --version`
-    MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \
-    's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'`
+
+dnl    MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \
+dnl    's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'`
+
+dnl test embedded mysql
+    MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lsupc++"
+    AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL])
+
     AC_MSG_RESULT($MYSQL_LIBS)
     AC_MSG_CHECKING(mysql includes)
     MYSQL_CFLAGS=`${mysqlconfig} --cflags`