[cairo-commit] roadster ChangeLog, 1.26, 1.27 README, 1.2, 1.3 configure.ac, 1.6, 1.7

[Nathan Fredrickson]

Committed by: nrf

Update of /cvs/cairo/roadster
In directory gabe:/tmp/cvs-serv4030

Modified Files:
	ChangeLog README configure.ac 
Log Message:
    * README: Update dependency list.
    * configure.ac: Re-add -lmygcc. Clean up.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	28 Feb 2005 06:31:04 -0000	1.26
+++ ChangeLog	28 Feb 2005 08:48:30 -0000	1.27
@@ -1,4 +1,8 @@
 2005-02-28  Nathan Fredrickson  <nathan at silverorange.com>
+	* README: Update dependency list.
+	* configure.ac: Re-add -lmygcc. Clean up.
+
+2005-02-28  Nathan Fredrickson  <nathan at silverorange.com>
 	* main.c: Make main_init() return a value.
 	* mainwindow.c: Add missing prototype. 
 	* configure.ac: Add pkgconfig check for libsvg and libsvg-cairo.

Index: README
===================================================================
RCS file: /cvs/cairo/roadster/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README	18 Feb 2005 21:42:27 -0000	1.2
+++ README	28 Feb 2005 08:48:30 -0000	1.3
@@ -1,10 +1,11 @@
-To compile, you will need:
+To compile, you will need develement packages of:
 
 - cairo
 - libpixman
-- mysql libraries and header files (v4.1 or newer)
+- libsvg
+- libsvg-cairo
+- libmysqld (embedded MySQL server, v4.1 or newer)
+- openssl (required by MySQL only)
 - gettext library and header files
-- gpsd program and header files
+- gpsd (libgps library and header files)
 
-To run Roadster, you will need:
-- mysql server (v4.1+ or newer)

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.ac	28 Feb 2005 06:31:04 -0000	1.6
+++ configure.ac	28 Feb 2005 08:48:30 -0000	1.7
@@ -88,14 +88,10 @@
 then
     AC_MSG_ERROR([mysql_config executable not found: MySQL 4.1.0 or greater is required.])
 else
-    AC_MSG_CHECKING(mysql libraries)
+    AC_MSG_CHECKING(MySQL libraries)
     MYSQL_VERSION=`${mysqlconfig} --version`
 
-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++"
+    MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lmygcc -lsupc++"
     AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL])
 
     AC_MSG_RESULT($MYSQL_LIBS)
@@ -104,7 +100,7 @@
 
     AX_COMPARE_VERSION("$MYSQL_VERSION", [ge], [4.1.0], 
         AC_MSG_RESULT("$MYSQL_CFLAGS"),
-        AC_MSG_ERROR([mysql version 4.1.0 or greater required]))
+        AC_MSG_ERROR([MySQL version 4.1.0 or greater required.]))
 
     AC_SUBST(MYSQL_LIBS)
     AC_SUBST(MYSQL_CFLAGS)