babl r403 - in trunk: . docs/graphics

[kcozens svn gnome org]

Author: kcozens
Date: Fri Mar 27 20:13:01 2009
New Revision: 403
URL: http://svn.gnome.org/viewvc/babl?rev=403&view=rev

Log:
* configure.ac: 
* docs/graphics/Makefile.am: Applied patch from Matteo 'Peach'
Pescarin which makes build use rsvg binary instead of inkscape
to create pngs. Fixes bug 571516.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/docs/graphics/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar 27 20:13:01 2009
@@ -134,8 +134,8 @@
 CFLAGS="$CFLAGS $extra_warnings"
 
 
-AC_PATH_PROG(INKSCAPE, inkscape, no)
-AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno")
+AC_PATH_PROG(RSVG, rsvg, no)
+AM_CONDITIONAL(HAVE_RSVG, test "x$RSVG" != "xno")
 
 AC_PATH_PROG(W3M, w3m, no)
 AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno")

Modified: trunk/docs/graphics/Makefile.am
==============================================================================
--- trunk/docs/graphics/Makefile.am	(original)
+++ trunk/docs/graphics/Makefile.am	Fri Mar 27 20:13:01 2009
@@ -1,6 +1,6 @@
 .SILENT:
 
-if HAVE_INKSCAPE
+if HAVE_RSVG
 PNG_FILES = 			\
 	babl-a4poster.png	\
 	babl-16x16.png 		\
@@ -21,18 +21,18 @@
 
 all: $(MAINTAINERCLEANFILES)
 
-INKSCAPE_CMD = echo -n " SVG: $@" ;\
-  $(INKSCAPE) -e $@ $< 2&>/dev/null\
+RSVG_CMD = echo -n " SVG: $@" ;\
+  $(RSVG) $< $ \
     &&\
       echo " [OK]"\
     ||\
       echo " FAIL"
 
-if HAVE_INKSCAPE
-dist-check-inkscape:
+if HAVE_RSVG
+dist-check-rsvg:
 
 %.png: %.svg
-	$(INKSCAPE_CMD)
+	$(RSVG_CMD)
 #-e $@ $< 2>/dev/null
 
 # the png version of the a4 poster is used as a webgraphic
@@ -40,16 +40,16 @@
 # 0.0
 babl-a4poster.png: babl-a4poster.svg
 	echo -n " SVG: $@" ;\
-	$(INKSCAPE) -e $@ $< -w 256 -y 0 2&>/dev/null\
+	$(RSVG) -w 256 $< $ \
 	  &&\
 	    echo " [OK]"\
 	  ||\
 	    echo " FAIL"
 else
-dist-check-inkscape:
-	@echo "*** inkscape must be available in order to make dist"
+dist-check-rsvg:
+	@echo "*** rsvg must be available in order to make dist"
 	@false
 endif
 
 
-dist-hook: dist-check-inkscape
+dist-hook: dist-check-rsvg