dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 773382 - --without-librsvg broken by tools/Makefile.am 

Fixed by making librsvg a hard dependency.
This commit is contained in:
Michael Natterer 2016-10-30 19:44:28 +01:00
parent d551a675fa
commit 43e218859b
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -1618,23 +1618,10 @@ AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = xyes)
# Check for librsvg
###################
AC_ARG_WITH(librsvg,[ --without-librsvg build without librsvg support])
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,,
[add_deps_error([rsvg >= rsvg_required_version])])
have_librsvg=no
if test "x$with_librsvg" != xno; then
have_librsvg=yes
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
FILE_SVG='file-svg$(EXEEXT)',
have_librsvg="no (librsvg not found)")
else
have_librsvg="no (librsvg support disabled)"
fi
if test "x$have_librsvg" = xyes; then
MIME_TYPES="$MIME_TYPES;image/svg+xml"
fi
AC_SUBST(FILE_SVG)
MIME_TYPES="$MIME_TYPES;image/svg+xml"
####################################

3
plug-ins/common/Makefile.am
View File

@ -101,7 +101,7 @@ libexec_PROGRAMS = \
file-psp \
file-raw-data \
file-sunras \
$(FILE_SVG) \
file-svg \
file-tga \
$(FILE_WMF) \
file-xbm \
@ -150,7 +150,6 @@ EXTRA_PROGRAMS = \
file-pdf-load \
file-pdf-save \
file-ps \
file-svg \
file-wmf \
file-xmc \
file-xpm \

2
plug-ins/common/plugin-defs.pl
View File

@ -51,7 +51,7 @@
'file-psp' => { ui => 1, gegl => 1, libs => 'Z_LIBS' },
'file-raw-data' => { ui => 1, gegl => 1 },
'file-sunras' => { ui => 1, gegl => 1 },
'file-svg' => { ui => 1, optional => 1, libs => 'SVG_LIBS', cflags => 'SVG_CFLAGS' },
'file-svg' => { ui => 1, libs => 'SVG_LIBS', cflags => 'SVG_CFLAGS' },
'file-tga' => { ui => 1, gegl => 1 },
'file-wmf' => { ui => 1, gegl => 1, optional => 1, libs => 'WMF_LIBS', cflags => 'WMF_CFLAGS' },
'file-xbm' => { ui => 1, gegl => 1 },