From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Nihvh-0003aG-Vb for garchives@archives.gentoo.org; Sat, 20 Feb 2010 05:31:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73A22E07E3; Sat, 20 Feb 2010 05:31:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 571E9E07E3 for ; Sat, 20 Feb 2010 05:31:01 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id DDD981B406C for ; Sat, 20 Feb 2010 05:31:00 +0000 (UTC) Received: from dirtyepic by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Nihvg-0007HY-IE for gentoo-commits@lists.gentoo.org; Sat, 20 Feb 2010 05:31:00 +0000 From: "Ryan Hill (dirtyepic)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dirtyepic@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/wxsvg/files: wxsvg-1.0.2-external-expat.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: wxsvg-1.0.2-external-expat.patch X-VCS-Directories: media-libs/wxsvg/files X-VCS-Committer: dirtyepic X-VCS-Committer-Name: Ryan Hill Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ryan Hill Date: Sat, 20 Feb 2010 05:31:00 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5f73b603-fdfa-46fe-b96b-abbabf953ec3 X-Archives-Hash: 1e431a6165c7f92e5d83558c56b3bfb9 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.pa= tch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/wxsvg/f= iles/wxsvg-1.0.2-external-expat.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/wxsvg/f= iles/wxsvg-1.0.2-external-expat.patch?rev=3D1.1&content-type=3Dtext/plain Index: wxsvg-1.0.2-external-expat.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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: enab= led)], [enable_ffmpeg=3D$enableval],[enable_ffmpeg=3Dyes]) +AC_ARG_WITH(sys-expat, + [ --with-sys-expat Use the system expat library (default: use b= undled expat library)], + [], [with_sys_expat=3Dno]) =20 AC_MSG_CHECKING(for install location) case "$prefix" in @@ -165,6 +168,15 @@ if test x$enable_ffmpeg =3D xyes; then LIBS=3D"$LIBS $FFMPEG_LIBS" fi =20 +dnl check if system expat requested +if test "x$with_sys_expat" =3D "xyes"; then + AC_CHECK_LIB([expat],[XML_ParserCreate],[SYS_EXPAT=3D"yes"]) + if test "x$SYS_EXPAT" =3D "x" ; then + AC_MSG_WARN([system expat library not found, will use built-in inste= ad]) + with_sys_expat=3Dno + fi +fi +AM_CONDITIONAL(SYS_EXPAT, [test x$with_sys_expat =3D xyes]) =20 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 =3D +else SUBDIRS =3D expat +endif =20 noinst_LTLIBRARIES =3D libwxsvgxml.la libwxsvgxml_la_SOURCES =3D svgxml.cpp svgxmlhelpr.cpp +if SYS_EXPAT +libwxsvgxml_la_LIBADD =3D -lexpat +else libwxsvgxml_la_LIBADD =3D expat/libexpat.la +endif =20 INCLUDES =3D -I$(top_builddir)/include/wxSVGXML