[patch] a patch which uses the m4 attached above

wxsvg-1.0-expat.patch (text/plain), 873 bytes, created by Arttu Valo on 2009-05-08 22:11:00 UTC

diff -ur wxsvg-1.0.old/configure.in wxsvg-1.0/configure.in
--- wxsvg-1.0.old/configure.in	2009-04-20 14:52:18.000000000 +0300
+++ wxsvg-1.0/configure.in	2009-04-20 14:54:26.000000000 +0300
@@ -165,6 +165,9 @@
   LIBS="$LIBS $FFMPEG_LIBS"
 fi
 
+dnl whether to use bundled libexpat
+AC_CHECK_LIBEXPATLA
+
 
 dnl vars
 AC_SUBST(LDFLAGS)
diff -ur wxsvg-1.0.old/src/svgxml/Makefile.am wxsvg-1.0/src/svgxml/Makefile.am
--- wxsvg-1.0.old/src/svgxml/Makefile.am	2009-04-20 14:52:18.000000000 +0300
+++ wxsvg-1.0/src/svgxml/Makefile.am	2009-04-20 17:25:50.000000000 +0300
@@ -1,7 +1,9 @@
-SUBDIRS = expat
+if MAYBE_EXPAT_SUBDIR
+  SUBDIRS = expat
+endif
 
 noinst_LTLIBRARIES = libwxsvgxml.la
 libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
-libwxsvgxml_la_LIBADD = expat/libexpat.la
+libwxsvgxml_la_LIBADD = $(my_libexpat_la)
 
 INCLUDES = -I$(top_builddir)/include/wxSVGXML