Attachment #344570 for bug #464782

View | Details | Raw Unified | Return to bug 464782
Collapse All | Expand All




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], [/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])


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])
fi

dnl --------------------------------------------------------------------------
dnl install locations

Lines 23-33 Link Here

(-)chemical-mime-data-0.1.94.orig/icons/hicolor/Makefile.am (-5 / +2 lines)
23	.svg.svgz:	23	.svg.svgz:
24	gzip $< -c > $@	24	gzip $< -c > $@
25	for size in $(icon_sizes) ; do \	25	for size in $(icon_sizes) ; do \
26	if test "x$(RSVG)" != "x" ; then \	26	$(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
27	$(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \	27	$(RSVG_CONVERT) -w $${size} -h $${size} -f png $< -o $*_$${size}.png ; \
28	else \
29	$(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
30	fi \
31	done	28	done
32		29
33	all-local: $(icon_sources:.svg=.svgz)	30	all-local: $(icon_sources:.svg=.svgz)

Return to bug 464782

Lines 90-114 Link Here

(-)chemical-mime-data-0.1.94.orig/configure.ac (-14 / +21 lines)
90	dnl rsvg or convert (imagemagick)	90	dnl rsvg or convert (imagemagick)
91	dnl --------------------------------------------------------------------------	91	dnl --------------------------------------------------------------------------
92		92
		93	# Search for both program but disable one of them using /bin/true
93	AC_ARG_VAR(	94	AC_ARG_VAR(
94	[CONVERT],	95	[CONVERT],
95	[The 'convert' binary with path. Use it to define or override the location of 'convert'.]	96	[The 'convert' binary with path. Use it to define or override the location of 'convert'.]
96	)	97	)
97	AC_PATH_PROG([CONVERT], [convert], [no])	98	AC_PATH_PROG([CONVERT], [convert], [/bin/true])
98	AC_SUBST([CONVERT])	99	AS_IF([test "x$CONVERT" = "x/bin/true"], [enable_convert=no])
		100
		101	AC_ARG_VAR(
		102	[RSVG_CONVERT],
		103	[The 'rsvg-convert' binary with path. Use it to define or override the location of 'rsvg-convert'.]
		104	)
		105	AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert], [/bin/true])
		106
99		107
100	if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then	108	AS_IF( [test "x$RSVG" = "x/bin/true"], AS_IF([test "x$RSVG_CONVERT" = "x/bin/true"],
101	AC_ARG_VAR(	109	AC_MSG_ERROR([Cannot find rsvg-convert (librsvg) or convert (imagemagick). Please install one of them.])))
102	[RSVG],	110
103	[The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]	111	AS_IF(
104	)	112	[test "x$enable_convert" = "xyes"],
105	AC_PATH_PROG([RSVG], [rsvg], [no])	113	[RSVG=/bin/true],
106	AC_SUBST([RSVG])	114	[CONVERT=/bin/true]
107	fi	115	)
108		116
109	if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then	117	AC_SUBST([CONVERT])
110	AC_MSG_ERROR([Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them.])	118	AC_SUBST([RSVG_CONVERT])
111	fi
112		119
113	dnl --------------------------------------------------------------------------	120	dnl --------------------------------------------------------------------------
114	dnl install locations	121	dnl install locations