Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 249625 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.in (+12 lines)
Lines 17-22 AC_ARG_ENABLE(render, Link Here
17
AC_ARG_ENABLE(ffmpeg,
17
AC_ARG_ENABLE(ffmpeg,
18
 [  --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled)],
18
 [  --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled)],
19
 [enable_ffmpeg=$enableval],[enable_ffmpeg=yes])
19
 [enable_ffmpeg=$enableval],[enable_ffmpeg=yes])
20
AC_ARG_WITH(sys-expat,
21
 [  --with-sys-expat        Use the system expat library (default: use bundled expat library)],
22
 [], [with_sys_expat=no])
20
23
21
AC_MSG_CHECKING(for install location)
24
AC_MSG_CHECKING(for install location)
22
case "$prefix" in
25
case "$prefix" in
Lines 165-170 if test x$enable_ffmpeg = xyes; then Link Here
165
  LIBS="$LIBS $FFMPEG_LIBS"
168
  LIBS="$LIBS $FFMPEG_LIBS"
166
fi
169
fi
167
170
171
dnl check if system expat requested
172
if test "x$with_sys_expat" = "xyes"; then
173
  AC_CHECK_LIB([expat],[XML_ParserCreate],[SYS_EXPAT="yes"])
174
  if test "x$SYS_EXPAT" = "x" ; then
175
    AC_MSG_WARN([system expat library not found, will use built-in instead])
176
	with_sys_expat=no
177
  fi
178
fi
179
AM_CONDITIONAL(SYS_EXPAT, [test x$with_sys_expat = xyes])
168
180
169
dnl vars
181
dnl vars
170
AC_SUBST(LDFLAGS)
182
AC_SUBST(LDFLAGS)
(-)a/src/svgxml/Makefile.am (+8 lines)
Lines 1-7 Link Here
1
if SYS_EXPAT
2
SUBDIRS =
3
else
1
SUBDIRS = expat
4
SUBDIRS = expat
5
endif
2
6
3
noinst_LTLIBRARIES = libwxsvgxml.la
7
noinst_LTLIBRARIES = libwxsvgxml.la
4
libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
8
libwxsvgxml_la_SOURCES = svgxml.cpp svgxmlhelpr.cpp
9
if SYS_EXPAT
10
libwxsvgxml_la_LIBADD = -lexpat
11
else
5
libwxsvgxml_la_LIBADD = expat/libexpat.la
12
libwxsvgxml_la_LIBADD = expat/libexpat.la
13
endif
6
14
7
INCLUDES = -I$(top_builddir)/include/wxSVGXML
15
INCLUDES = -I$(top_builddir)/include/wxSVGXML

Return to bug 249625