configure.ac: remove remaining traces of optional librsvg

This commit is contained in:
Michael Natterer 2016-10-31 01:35:31 +01:00
parent f5ecc53f3e
commit a13460b8c3
1 changed files with 11 additions and 15 deletions

View File

@ -2071,6 +2071,7 @@ AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno")
AC_PATH_PROG(XSLTPROC, xsltproc, no) AC_PATH_PROG(XSLTPROC, xsltproc, no)
AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
######################## ########################
# Check for vector icons # Check for vector icons
######################## ########################
@ -2079,9 +2080,6 @@ AC_ARG_ENABLE(vector-icons, [ --enable-vector-icons generate vector icons], ,
enable_vector_icons=no) enable_vector_icons=no)
if test "x$enable_vector_icons" = "xyes"; then if test "x$enable_vector_icons" = "xyes"; then
if test "x$have_librsvg" != "xyes"; then
enable_vector_icons="no (librsvg missing)"
else
# Check if librsvg was built with --disable-pixbuf-loader. # Check if librsvg was built with --disable-pixbuf-loader.
gdk_pixbuf_moduledir=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` gdk_pixbuf_moduledir=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
# AC_CHECK_FILE macro does not work when cross-compiling and exits with: # AC_CHECK_FILE macro does not work when cross-compiling and exits with:
@ -2094,7 +2092,6 @@ if test "x$enable_vector_icons" = "xyes"; then
else else
enable_vector_icons="no (librsvg GdkPixbuf loader missing)" enable_vector_icons="no (librsvg GdkPixbuf loader missing)"
fi fi
fi
fi fi
if test "x$enable_vector_icons" = "xyes"; then if test "x$enable_vector_icons" = "xyes"; then
@ -2583,7 +2580,6 @@ Optional Plug-Ins:
Print: $enable_print Print: $enable_print
Python 2: $enable_python Python 2: $enable_python
Script-Fu: $have_script_fu Script-Fu: $have_script_fu
SVG: $have_librsvg
TWAIN (Win32): $os_win32 TWAIN (Win32): $os_win32
Webpage: $have_webkit Webpage: $have_webkit
WMF: $have_libwmf WMF: $have_libwmf