add framework for an svg:cairo loadimage plugin using librsvg2

diff --git a/configure.ac b/configure.ac
index 5b69d001bf61dfac6ec5be1029b11260381a9e34..c44a418f6456166ba508c30cefaeec4e3b01f59b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1593,6 +1593,24 @@ AC_SUBST(IPSEPCOLA_LIBS)
 fi
 AM_CONDITIONAL(WITH_IPSEPCOLA, [test "x$with_ipsepcola" = "xyes"])
 
+dnl -----------------------------------
+dnl INCLUDES and LIBS for SVG
+                                                                                
+AC_ARG_WITH(rsvg,
+  [AC_HELP_STRING([--with-rsvg=yes], [rsvg library])],
+  [], [with_rsvg=yes])
+
+if test "x$with_rsvg" = "xyes"; then
+PKG_CHECK_MODULES(RSVG, [librsvg-2.0],
+       [HAVE_RSVG=1
+       AC_DEFINE_UNQUOTED(HAVE_RSVG,1,
+               [Define if you have the rsvg library])],
+       [AC_MSG_WARN(rsvg library not available)])
+AC_SUBST(RSVG_CFLAGS)
+AC_SUBST(RSVG_LIBS)
+fi
+AM_CONDITIONAL(WITH_RSVG, [test "x$HAVE_RSVG" != "x"])
+
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PANGO, CAIRO et.al.
                                                                                 
@@ -2298,6 +2316,7 @@ AC_CONFIG_FILES(Makefile
        plugin/core/Makefile
        plugin/devil/Makefile
        plugin/gdk_pixbuf/Makefile
+       plugin/rsvg/Makefile
        plugin/gd/Makefile
        plugin/pango/Makefile
        plugin/ming/Makefile

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 7e140979ed66c8f2b67cffde235acbbe82087eb9..cddc83e897874d480abf68d4da0dddb6e70ecf50 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -43,6 +43,7 @@ Prefix: /usr
 %define IPSEPCOLA --without-ipsepcola
 %define MYLIBGD --with-mylibgd
 %define PANGOCAIRO --without-pangocairo
+%define RSVG --without-rsvg
 %define DEVIL 0
 %define MING 0
 %define GDK_PIXBUF --without-gdk-pixbuf
@@ -149,6 +150,8 @@ BuildRequires: gd gd-devel perl-devel DevIL-devel
 %if "%fedora" >= "8"
 #define R_LANG 1
 #BuildRequires: R swig >= 1.3.33
+%define RSVG --with-rsvg
+BuildRequires: librsvg2
 %endif
 %if "%fedora" >= "9"
 %define MING 0

diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 0dd6d37f5a97c7bc8444f3e3311d028da8170ec3..8fc2581059765ce7fdb524cf126d274de888a2a5 100644 (file)
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = core gd pango dot_layout neato_layout xlib gtk ming devil gdk_pixbuf
+SUBDIRS = core gd pango dot_layout neato_layout xlib gtk ming devil gdk_pixbuf rsvg
 
 EXTRA_DIST = Makefile.old