Add:Core:Added scaling for flag and nav svgs

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1656 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/configure.in b/configure.in
index cb7b993..2c31b9f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -518,7 +518,9 @@ AM_CONDITIONAL(BINDING_DBUS, test "x${binding_dbus}" = "xyes")
 # svg
 AC_ARG_ENABLE(svg, [  --disable-svg        disable Scalable Vector Graphics], enable_svg=$enableval, enable_svg=yes)
 AC_ARG_ENABLE(svg2png, [  --disable-svg2png        disable conversion of svgs to pngs], enable_svg2png=$enableval, enable_svg2png=yes)
-AC_ARG_ENABLE(svg2png_scaling, [  --enable-svg2png-scaling   enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96")
+AC_ARG_ENABLE(svg2png-scaling, [  --enable-svg2png-scaling   enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96")
+AC_ARG_ENABLE(svg2png-scaling-flag, [  --enable-svg2png-scaling-flag   enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="")
+AC_ARG_ENABLE(svg2png-scaling-nav, [  --enable-svg2png-scaling-nav   enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="")
 if test "x${enable_svg2png}" = "xyes" ; then
        AC_PATH_PROG([KSVGTOPNG], [ksvgtopng], [])
        if test ! -x "$KSVGTOPNG"; then
@@ -526,7 +528,11 @@ if test "x${enable_svg2png}" = "xyes" ; then
         fi
 fi
 AC_SUBST(SVG2PNG_SCALES)
+AC_SUBST(SVG2PNG_SCALES_FLAG)
+AC_SUBST(SVG2PNG_SCALES_NAV)
 AM_CONDITIONAL(USE_SVG2PNG_SCALES, test "x${SVG2PNG_SCALES}" != "xyes" -a "x${SVG2PNG_SCALES}" != "x")
+AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes" -a "x${SVG2PNG_SCALES_FLAG}" != "x")
+AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x")
 AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes")
 AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes")
 

diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
index c637cc2..ab63e11 100644 (file)
--- a/navit/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
@@ -163,6 +163,12 @@ xpm_DATA += $(addsuffix .png,$(basename $(svgs)))
 if USE_SVG2PNG_SCALES
 xpm_DATA += $(foreach scale, @SVG2PNG_SCALES@, $(addsuffix _$(scale)_$(scale).png,$(basename $(svgs))))
 endif
+if USE_SVG2PNG_SCALES_FLAG
+xpm_DATA += $(foreach scale, @SVG2PNG_SCALES_FLAG@, $(addsuffix _$(scale)_$(scale).png,$(basename $(flag_svgs))))
+endif
+if USE_SVG2PNG_SCALES_NAV
+xpm_DATA += $(foreach scale, @SVG2PNG_SCALES_NAV@, $(addsuffix _$(scale)_$(scale).png,$(basename $(nav_svgs))))
+endif
 endif
 
 DESKTOPFILEdir=$(datadir)/applications