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

[Michael Natterer <mitch src gnome org>]

commit 43e218859b09ff648088f4820642d92c57f0ddb6
Author: Michael Natterer <mitch gimp org>
Date:   Sun Oct 30 19:44:28 2016 +0100

    Bug 773382 - --without-librsvg broken by tools/Makefile.am
    
    Fixed by making librsvg a hard dependency.

 configure.ac                   |   19 +++----------------
 plug-ins/common/Makefile.am    |    3 +--
 plug-ins/common/plugin-defs.pl |    2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f49c762..42cae34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
-
-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
+PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,,
+                  [add_deps_error([rsvg >= rsvg_required_version])])
 
-AC_SUBST(FILE_SVG)
+MIME_TYPES="$MIME_TYPES;image/svg+xml"
 
 
 ####################################
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 318bedc..e9ea6b2 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -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 \
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 8ec6073..324e7da 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -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 },