diff options
| author | Eli Zaretskii | 2013-12-08 21:28:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-08 21:28:29 +0200 |
| commit | 83a5a2c877e0208cfcfaa9bb84b26366a1b48fad (patch) | |
| tree | be714dad48756e2e178336dd9ae136ff1ab8f3c8 | |
| parent | 939fef2978c6d879fb28a5cd32d21da77241cbac (diff) | |
| download | emacs-83a5a2c877e0208cfcfaa9bb84b26366a1b48fad.tar.gz emacs-83a5a2c877e0208cfcfaa9bb84b26366a1b48fad.zip | |
Fix librsvg build on MS-Windows.
configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg statically.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 9 insertions, 0 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-08 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg | ||
| 4 | statically. | ||
| 5 | |||
| 1 | 2013-12-08 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-12-08 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * configure.ac: Simplify supression of GTK deprecation warning. | 8 | * 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}" = | |||
| 2136 | if test $HAVE_RSVG = yes; then | 2136 | if test $HAVE_RSVG = yes; then |
| 2137 | AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.]) | 2137 | AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.]) |
| 2138 | CFLAGS="$CFLAGS $RSVG_CFLAGS" | 2138 | CFLAGS="$CFLAGS $RSVG_CFLAGS" |
| 2139 | # Windows loads librsvg dynamically | ||
| 2140 | if test "${opsys}" = "mingw32"; then | ||
| 2141 | RSVG_LIBS= | ||
| 2142 | fi | ||
| 2139 | LIBS="$RSVG_LIBS $LIBS" | 2143 | LIBS="$RSVG_LIBS $LIBS" |
| 2140 | fi | 2144 | fi |
| 2141 | fi | 2145 | fi |