From 2cee2d73e23c18d7ed15f861d5a4b46c60e13252 Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 2 May 2019 20:51:09 +0200 Subject: Make inkscape and rsvg-convert optional TEST on Fedora: inkscape, librsvg2-tools package are not installed on system: The user can build, install and distribute the package: $ sudo dnf remove inkscape librsvg2-tools -y $ ./configure --prefix=/usr $ make $ sudo make install $ make distcheck logview/data/icons: Can not run build-png-icons target if inkscape package is not installed on system: $ make -C logview/data/icons clean-png-icons make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' rm -f hicolor_apps_16x16_mate-system-log.png hicolor_apps_22x22_mate-system-log.png hicolor_apps_32x32_mate-system-log.png hicolor_apps_48x48_mate-system-log.png hicolor_apps_256x256_mate-system-log.png make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' $ make -C logview/data/icons build-png-icons make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' make: *** No rule to make target 'hicolor_apps_16x16_mate-system-log.png', needed by 'build-png-icons'. Stop. make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' Can run build-png-icons target if inkscape package is installed on system: $ sudo dnf install inkscape -y $ ./configure --prefix=/usr $ make -C logview/data/icons build-png-icons make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' Background RRGGBBAA: ffffff00 Area 303:65:319:81 exported to 16 x 16 pixels (96 dpi) Bitmap saved as: hicolor_apps_16x16_mate-system-log.png Background RRGGBBAA: ffffff00 Area 303:101:325:123 exported to 22 x 22 pixels (96 dpi) Bitmap saved as: hicolor_apps_22x22_mate-system-log.png Background RRGGBBAA: ffffff00 Area 304:142:336:174 exported to 32 x 32 pixels (96 dpi) Bitmap saved as: hicolor_apps_32x32_mate-system-log.png Background RRGGBBAA: ffffff00 Area 296:202:344:250 exported to 48 x 48 pixels (96 dpi) Bitmap saved as: hicolor_apps_48x48_mate-system-log.png Background RRGGBBAA: ffffff00 Area 33:11:289:267 exported to 256 x 256 pixels (96 dpi) Bitmap saved as: hicolor_apps_256x256_mate-system-log.png make: Nothing to be done for 'build-png-icons'. make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' baobab/pixmaps: Can not run build-png-icons target if librsvg2-tools package is not installed on system: $ make -C baobab/pixmaps clean-png-icons make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' rm -f hicolor_apps_16x16_mate-disk-usage-analyzer.png hicolor_apps_22x22_mate-disk-usage-analyzer.png hicolor_apps_32x32_mate-disk-usage-analyzer.png hicolor_apps_48x48_mate-disk-usage-analyzer.png hicolor_apps_128x128_mate-disk-usage-analyzer.png make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' $ make -C baobab/pixmaps build-png-icons make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' make: *** No rule to make target 'hicolor_apps_16x16_mate-disk-usage-analyzer.png', needed by 'build-png-icons'. Stop. make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' Can run build-png-icons target if librsvg2-tools package is installed on system: $ sudo dnf install -y librsvg2-tools $ ./configure --prefix=/usr $ make -C baobab/pixmaps build-png-icons make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' /usr/bin/rsvg-convert -w 16 -h 16 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_16x16_mate-disk-usage-analyzer.png /usr/bin/rsvg-convert -w 22 -h 22 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_22x22_mate-disk-usage-analyzer.png /usr/bin/rsvg-convert -w 32 -h 32 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_32x32_mate-disk-usage-analyzer.png /usr/bin/rsvg-convert -w 48 -h 48 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_48x48_mate-disk-usage-analyzer.png /usr/bin/rsvg-convert -w 128 -h 128 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_128x128_mate-disk-usage-analyzer.png make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' Closes #223 --- configure.ac | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f1fe2e9d..e4c54bc7 100644 --- a/configure.ac +++ b/configure.ac @@ -31,13 +31,9 @@ AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) dnl ICONS: convert svg to png AC_PATH_PROG(RSVG_CONVERT, rsvg-convert) -if test x$RSVG_CONVERT = x ; then - AC_MSG_ERROR([could not locate rsvg-convert]) -fi +AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x]) AC_PATH_PROG(INKSCAPE, inkscape) -if test x$INKSCAPE = x ; then - AC_MSG_ERROR([could not locate inkscape]) -fi +AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x]) MATE_COMPILE_WARNINGS([yes]) -- cgit v1.2.1