[cairo-commit] roadster ChangeLog,1.21,1.22 configure.ac,1.3,1.4

[Ian McIntosh]

Committed by: ian

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
        * track.c:
        * track.h:
        * point.c:
        * point.h:
        * pointstring.c:
        * pointstring.h: Added.
        * configure.ac: Updated for embedded mysql.
        * src/Makefile.am: Added new files.
        * databasewindow.c: Made all dead code.  (No need for database window with embedded mysql)
        * db.c: Assume string format from embedded DB is reasonable in db_parse_point() and db_parse_pointstring().
        * geometryset.c: Move point and pointstring code into separate files.
        * gpsclient.c: Misc cleanup.
        * gui.c: Remove databasewindow from startup code path.
        * import.c: Remove GnomeVFS init.
        * main.c: Add GnomeVFS init.  Create ~/.roadster if missing.
        * layers.c: Style tweaks.
        * mainwindow.c: Add quasi-hack to record/draw GPS tracks.
        * map.c: Layer "halo" setting is now a stroke width number, not a boolean. Don't call cairo_set_dash for solid lines.  New track drawing.
        * search_road.c: Use renamed pointstring functions.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	24 Feb 2005 19:38:59 -0000	1.21
+++ ChangeLog	26 Feb 2005 04:41:40 -0000	1.22
@@ -1,3 +1,25 @@
+2005-02-25  Ian McIntosh  <ian_mcintosh at linuxadvocate.org>
+
+	* track.c:
+	* track.h:
+	* point.c:
+	* point.h:
+	* pointstring.c:
+	* pointstring.h: Added.
+	* configure.ac: Updated for embedded mysql.
+	* src/Makefile.am: Added new files.
+	* databasewindow.c: Made all dead code.  (No need for database window with embedded mysql)
+	* db.c: Assume string format from embedded DB is reasonable in db_parse_point() and db_parse_pointstring().
+	* geometryset.c: Move point and pointstring code into separate files.
+	* gpsclient.c: Misc cleanup.
+	* gui.c: Remove databasewindow from startup code path.
+	* import.c: Remove GnomeVFS init.
+	* main.c: Add GnomeVFS init.  Create ~/.roadster if missing.
+	* layers.c: Style tweaks.
+	* mainwindow.c: Add quasi-hack to record/draw GPS tracks.
+	* map.c: Layer "halo" setting is now a stroke width number, not a boolean. Don't call cairo_set_dash for solid lines.  New track drawing.
+	* search_road.c: Use renamed pointstring functions.
+
 2005-02-24  Nathan Fredrickson  <nathan at silverorange.com>
 	
 	* po/roadster.pot: Removed, this is generated.
@@ -44,7 +66,7 @@
 
 2005-02-22  Ian McIntosh  <ian_mcintosh at linuxadvocate.org>
 
-	* main.c: Added call to init scenemanager. 
+	* main.c: Added call to init scenemanager.
 	* scenemanager.c: Added quasi-hack to prevent road/label names from showing up twice on one screen.
 	* map.c: Request permission from scenemanager before drawing a label.
 

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	24 Feb 2005 19:38:59 -0000	1.3
+++ configure.ac	26 Feb 2005 04:41:40 -0000	1.4
@@ -90,8 +90,14 @@
 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` -lmygcc -lsupc++"
+    AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL])
+
     AC_MSG_RESULT($MYSQL_LIBS)
     AC_MSG_CHECKING(mysql includes)
     MYSQL_CFLAGS=`${mysqlconfig} --cflags`