[cairo-commit] roadster ChangeLog,1.29,1.30 configure.ac,1.8,1.9

[Nathan Fredrickson]

Committed by: nrf

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
    * src/Makefile.am:
    * configure.ac: Check separately for libsvg and continue if not found. Define HAVE_LIBSVG if present.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	2 Mar 2005 06:25:48 -0000	1.29
+++ ChangeLog	2 Mar 2005 21:28:54 -0000	1.30
@@ -1,3 +1,7 @@
+2005-02-28  Nathan Fredrickson  <nathan at silverorange.com>
+	* src/Makefile.am:
+	* configure.ac: Check separately for libsvg and continue if not found. Define HAVE_LIBSVG if present.
+
 2005-03-02  Ian McIntosh  <ian_mcintosh at linuxadvocate.org>
 
 	* search_road.c:

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	1 Mar 2005 04:00:10 -0000	1.8
+++ configure.ac	2 Mar 2005 21:28:54 -0000	1.9
@@ -42,7 +42,7 @@
 AC_SUBST(GNOME_CFLAGS)
 
 dnl ========= check for cairo ==================================================
-PKG_CHECK_MODULES(CAIRO, cairo libsvg libsvg-cairo,,exit)
+PKG_CHECK_MODULES(CAIRO, cairo,,exit)
 
 AC_SUBST(CAIRO_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
@@ -52,6 +52,14 @@
     continue
 )
 
+dnl ========= check for libsvg =================================================
+PKG_CHECK_MODULES(LIBSVG, libsvg libsvg-cairo,
+	[AC_DEFINE([HAVE_LIBSVG], [1], [Have libsvg])],
+	continue
+)
+AC_SUBST(LIBSVG_LIBS)
+AC_SUBST(LIBSVG_CFLAGS)
+
 dnl ========= deprecated options ===============================================
 AC_ARG_ENABLE(deprecated,
 AC_HELP_STRING([--disable-deprecated],