* [gentoo-commits] gentoo-x86 commit in media-libs/wxsvg/files: wxsvg-1.0.2-external-expat.patch
@ 2010-02-20 5:31 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-02-20 5:31 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/02/20 05:31:00
Added: wxsvg-1.0.2-external-expat.patch
Log:
Add support for building against system expat. (bug #249625 by Diego)
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Revision Changes Path
1.1 media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/wxsvg/files/wxsvg-1.0.2-external-expat.patch?rev=1.1&content-type=text/plain
Index: wxsvg-1.0.2-external-expat.patch
===================================================================
https://bugs.gentoo.org/249625
https://sourceforge.net/projects/wxsvg/forums/forum/424987/topic/2875326
diff --git a/configure.in b/configure.in
index 233fc88..92a2814 100644
--- a/configure.in
+++ b/configure.in
@@ -17,6 +17,9 @@ AC_ARG_ENABLE(render,
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg Enable ffmpeg decoder support (default: enabled)],
[enable_ffmpeg=$enableval],[enable_ffmpeg=yes])
+AC_ARG_WITH(sys-expat,
+ [ --with-sys-expat Use the system expat library (default: use bundled expat library)],
+ [], [with_sys_expat=no])
AC_MSG_CHECKING(for install location)
case "$prefix" in
@@ -165,6 +168,15 @@ if test x$enable_ffmpeg = xyes; then
LIBS="$LIBS $FFMPEG_LIBS"
fi
+dnl check if system expat requested
+if test "x$with_sys_expat" = "xyes"; then
+ AC_CHECK_LIB([expat],[XML_ParserCreate],[SYS_EXPAT="yes"])
+ if test "x$SYS_EXPAT" = "x" ; then
+ AC_MSG_WARN([system expat library not found, will use built-in instead])
+ with_sys_expat=no
+ fi
+fi
+AM_CONDITIONAL(SYS_EXPAT, [test x$with_sys_expat = xyes])
dnl vars
AC_SUBST(LDFLAGS)
diff --git a/src/svgxml/Makefile.am b/src/svgxml/Makefile.am
index 28ef05c..72370ea 100644
--- a/src/svgxml/Makefile.am
+++ b/src/svgxml/Makefile.am
@@ -1,7 +1,15 @@
+if SYS_EXPAT
+SUBDIRS =
+else
SUBDIRS = expat
+endif
noinst_LTLIBRARIES = libwxsvgxml.la
libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
+if SYS_EXPAT
+libwxsvgxml_la_LIBADD = -lexpat
+else
libwxsvgxml_la_LIBADD = expat/libexpat.la
+endif
INCLUDES = -I$(top_builddir)/include/wxSVGXML
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/wxsvg/files: wxsvg-1.0.2-external-expat.patch
@ 2011-02-27 13:23 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-02-27 13:23 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/02/27 13:23:07
Removed: wxsvg-1.0.2-external-expat.patch
Log:
Version bump, remove old.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-27 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-20 5:31 [gentoo-commits] gentoo-x86 commit in media-libs/wxsvg/files: wxsvg-1.0.2-external-expat.patch Ryan Hill (dirtyepic)
-- strict thread matches above, loose matches on Subject: below --
2011-02-27 13:23 Ryan Hill (dirtyepic)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox