aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlp Aker2011-07-28 14:33:24 -0400
committerChong Yidong2011-07-28 14:33:24 -0400
commitbe8ec0b3d40a22b9cb180d7cb3c9d22c81c64f14 (patch)
tree2be4e90c7279b07b04a51bef686feabbcc9af771
parentffe57a7a0e3d4fc66625d6931e6dc925f5bfa9d9 (diff)
downloademacs-be8ec0b3d40a22b9cb180d7cb3c9d22c81c64f14.tar.gz
emacs-be8ec0b3d40a22b9cb180d7cb3c9d22c81c64f14.zip
Allow building with librsvg on Darwin (Bug#9177).
* configure.in (HAVE_RSVG): Allow use of -lrsvg-2 for any NextStep build, not just GNUstep.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b084d7162c..5b5772f13b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12011-07-28 Alp Aker <alp.tekin.aker@gmail.com>
2
3 * configure.in (HAVE_RSVG): Allow use of -lrsvg-2 for any NextStep
4 build, not just GNUstep (Bug#9177).
5
12011-07-28 Paul Eggert <eggert@cs.ucla.edu> 62011-07-28 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Assume freestanding C89 headers, string.h, stdlib.h. 8 Assume freestanding C89 headers, string.h, stdlib.h.
diff --git a/configure.in b/configure.in
index 04a123d3e83..45219587131 100644
--- a/configure.in
+++ b/configure.in
@@ -1820,7 +1820,7 @@ fi
1820 1820
1821### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. 1821### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
1822HAVE_RSVG=no 1822HAVE_RSVG=no
1823if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then 1823if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
1824 if test "${with_rsvg}" != "no"; then 1824 if test "${with_rsvg}" != "no"; then
1825 RSVG_REQUIRED=2.11.0 1825 RSVG_REQUIRED=2.11.0
1826 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" 1826 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"