diff -ur chemical-mime-data-0.1.94.orig/configure.ac chemical-mime-data-0.1.94/configure.ac --- chemical-mime-data-0.1.94.orig/configure.ac 2007-02-04 04:22:31.000000000 +0100 +++ chemical-mime-data-0.1.94/configure.ac 2013-04-06 01:29:50.334699773 +0200 @@ -90,25 +90,32 @@ dnl rsvg or convert (imagemagick) dnl -------------------------------------------------------------------------- +# Search for both program but disable one of them using /bin/true AC_ARG_VAR( [CONVERT], [The 'convert' binary with path. Use it to define or override the location of 'convert'.] ) -AC_PATH_PROG([CONVERT], [convert], [no]) -AC_SUBST([CONVERT]) +AC_PATH_PROG([CONVERT], [convert], [/bin/true]) +AS_IF([test "x$CONVERT" = "x/bin/true"], [enable_convert=no]) + +AC_ARG_VAR( + [RSVG_CONVERT], + [The 'rsvg-convert' binary with path. Use it to define or override the location of 'rsvg-convert'.] +) +AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert], [/bin/true]) + -if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then - AC_ARG_VAR( - [RSVG], - [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.] - ) - AC_PATH_PROG([RSVG], [rsvg], [no]) - AC_SUBST([RSVG]) -fi - -if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then - AC_MSG_ERROR([Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them.]) -fi +AS_IF( [test "x$RSVG" = "x/bin/true"], AS_IF([test "x$RSVG_CONVERT" = "x/bin/true"], + AC_MSG_ERROR([Cannot find rsvg-convert (librsvg) or convert (imagemagick). Please install one of them.]))) + +AS_IF( + [test "x$enable_convert" = "xyes"], + [RSVG=/bin/true], + [CONVERT=/bin/true] +) + +AC_SUBST([CONVERT]) +AC_SUBST([RSVG_CONVERT]) dnl -------------------------------------------------------------------------- dnl install locations diff -ur chemical-mime-data-0.1.94.orig/icons/hicolor/Makefile.am chemical-mime-data-0.1.94/icons/hicolor/Makefile.am --- chemical-mime-data-0.1.94.orig/icons/hicolor/Makefile.am 2007-01-28 16:54:14.000000000 +0100 +++ chemical-mime-data-0.1.94/icons/hicolor/Makefile.am 2013-04-06 01:25:57.235701082 +0200 @@ -23,11 +23,8 @@ .svg.svgz: gzip $< -c > $@ for size in $(icon_sizes) ; do \ - if test "x$(RSVG)" != "x" ; then \ - $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \ - else \ - $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \ - fi \ + $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \ + $(RSVG_CONVERT) -w $${size} -h $${size} -f png $< -o $*_$${size}.png ; \ done all-local: $(icon_sources:.svg=.svgz)