Fix librsvg build on MS-Windows.

 configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg statically.

diff --git a/ChangeLog b/ChangeLog
index 2b1d363face6685a23e90727770b629b2b9f1170..9e47a2a4d070722a6063b62379d18346d5d73396 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg
+       statically.
+
 2013-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.ac: Simplify supression of GTK deprecation warning.

diff --git a/configure.ac b/configure.ac
index 5240afac2917a626c93e81a60972250de97f9460..1f99a658cec8c7a41055aaeed087e530903fdacb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2136,6 +2136,10 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" =
     if test $HAVE_RSVG = yes; then
       AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.])
       CFLAGS="$CFLAGS $RSVG_CFLAGS"
+      # Windows loads librsvg dynamically
+      if test "${opsys}" = "mingw32"; then
+               RSVG_LIBS=
+      fi
       LIBS="$RSVG_LIBS $LIBS"
     fi
   fi