From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 8 Dec 2013 19:28:29 +0000 (+0200)
Subject: Fix librsvg build on MS-Windows.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~505
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83a5a2c877e0208cfcfaa9bb84b26366a1b48fad;p=emacs.git

Fix librsvg build on MS-Windows.

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

diff --git a/ChangeLog b/ChangeLog
index 2b1d363face..9e47a2a4d07 100644
--- 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 5240afac291..1f99a658cec 100644
--- 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