[cairo-commit] roadster ChangeLog,1.25,1.26 configure.ac,1.5,1.6

[Nathan Fredrickson]

Committed by: nrf

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
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.
    * src/Makefile.am: Remove the hacky inclusion of libsvg-cairo.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	28 Feb 2005 03:25:23 -0000	1.25
+++ ChangeLog	28 Feb 2005 06:31:04 -0000	1.26
@@ -1,3 +1,9 @@
+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.
+	* src/Makefile.am: Remove the hacky inclusion of libsvg-cairo.
+
 2005-02-27  Ian McIntosh  <ian_mcintosh at linuxadvocate.org>
 
 	* configure.ac: Added libsvg-cairo as dependency. (Not quite correct. Nate will fix it.:)

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	28 Feb 2005 03:25:23 -0000	1.5
+++ configure.ac	28 Feb 2005 06:31:04 -0000	1.6
@@ -42,16 +42,16 @@
 AC_SUBST(GNOME_CFLAGS)
 
 dnl ========= check for cairo ==================================================
-dnl PKG_CHECK_MODULES(CAIRO, cairo libsvg-cairo,,exit)
-
-PKG_CHECK_MODULES(CAIRO, cairo > 0.2.0,
-    [AC_DEFINE([HAVE_NEWER_CAIRO], [1], [Newer Cairo])],
-    [PKG_CHECK_MODULES(CAIRO, cairo,,exit)]
-)
+PKG_CHECK_MODULES(CAIRO, cairo libsvg libsvg-cairo,,exit)
 
 AC_SUBST(CAIRO_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
 
+PKG_CHECK_MODULES(, cairo>0.2.0,
+    [AC_DEFINE([HAVE_CAIRO_0_2_0], [1], [Newer Cairo])],
+    continue
+)
+
 dnl ========= deprecated options ===============================================
 AC_ARG_ENABLE(deprecated,
 AC_HELP_STRING([--disable-deprecated],
@@ -95,7 +95,7 @@
 dnl    's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'`
 
 dnl test embedded mysql
-    MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lmygcc -lsupc++"
+    MYSQL_LIBS="`${mysqlconfig} --libmysqld-libs` -lsupc++"
     AC_DEFINE([HAVE_MYSQL_EMBED], [1], [Have embedded MySQL])
 
     AC_MSG_RESULT($MYSQL_LIBS)