зеркало из https://github.com/mozilla/pjs.git
Patch from andreas.otte@primus-online.de to add an "--enable-svg"
option to configure. Defaults to not building svg.
This commit is contained in:
Родитель
1210745bf0
Коммит
9ccca20458
|
@ -755,6 +755,18 @@ if [ "$MOZ_MATHML" ]; then
|
||||||
END_MATHML_MAKEFILES
|
END_MATHML_MAKEFILES
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# layout/svg
|
||||||
|
if [ "$MOZ_SVG" ]; then
|
||||||
|
add_makefiles <<END_SVG_MAKEFILES
|
||||||
|
layout/svg/Makefile
|
||||||
|
layout/svg/base/Makefile
|
||||||
|
layout/svg/base/public/Makefile
|
||||||
|
layout/svg/base/src/Makefile
|
||||||
|
layout/svg/content/Makefile
|
||||||
|
layout/svg/content/src/Makefile
|
||||||
|
END_SVG_MAKEFILES
|
||||||
|
fi
|
||||||
|
|
||||||
if [ `echo "$MOZ_EXTENSIONS" | grep -c cookie` != 0 ]; then
|
if [ `echo "$MOZ_EXTENSIONS" | grep -c cookie` != 0 ]; then
|
||||||
add_makefiles <<END_EXTENSIONS_COOKIE_MAKEFILES
|
add_makefiles <<END_EXTENSIONS_COOKIE_MAKEFILES
|
||||||
extensions/cookie/Makefile
|
extensions/cookie/Makefile
|
||||||
|
|
|
@ -92,6 +92,7 @@ MOZ_NATIVE_PNG = @SYSTEM_PNG@
|
||||||
|
|
||||||
MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
|
MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
|
||||||
MOZ_MATHML = @MOZ_MATHML@
|
MOZ_MATHML = @MOZ_MATHML@
|
||||||
|
MOZ_SVG = @MOZ_SVG@
|
||||||
|
|
||||||
MOZ_INSURE = @MOZ_INSURE@
|
MOZ_INSURE = @MOZ_INSURE@
|
||||||
MOZ_INSURIFYING = @MOZ_INSURIFYING@
|
MOZ_INSURIFYING = @MOZ_INSURIFYING@
|
||||||
|
|
10
configure.in
10
configure.in
|
@ -3131,6 +3131,15 @@ MOZ_ARG_ENABLE_BOOL(mathml,
|
||||||
MOZ_MATHML=1
|
MOZ_MATHML=1
|
||||||
AC_DEFINE(MOZ_MATHML))
|
AC_DEFINE(MOZ_MATHML))
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl --enable svg
|
||||||
|
dnl TODO: handle include files here ?
|
||||||
|
dnl
|
||||||
|
MOZ_ARG_ENABLE_BOOL(svg,
|
||||||
|
[ --enable-svg Enable SVG ],
|
||||||
|
MOZ_SVG=1
|
||||||
|
AC_DEFINE(MOZ_SVG))
|
||||||
|
|
||||||
dnl Need the contents of config-defs.h in the build logs
|
dnl Need the contents of config-defs.h in the build logs
|
||||||
VERBOSE_CONFIG_DEFS=1
|
VERBOSE_CONFIG_DEFS=1
|
||||||
AC_ARG_ENABLE(verbose-config-defs,
|
AC_ARG_ENABLE(verbose-config-defs,
|
||||||
|
@ -3239,6 +3248,7 @@ AC_SUBST(MOZ_GFX_TOOLKIT)
|
||||||
AC_SUBST(MOZ_GFX_TOOLKIT_LDFLAGS)
|
AC_SUBST(MOZ_GFX_TOOLKIT_LDFLAGS)
|
||||||
AC_SUBST(MOZ_UPDATE_XTERM)
|
AC_SUBST(MOZ_UPDATE_XTERM)
|
||||||
AC_SUBST(MOZ_MATHML)
|
AC_SUBST(MOZ_MATHML)
|
||||||
|
AC_SUBST(MOZ_SVG)
|
||||||
AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
|
AC_SUBST(MOZ_MONOLITHIC_TOOLKIT)
|
||||||
AC_SUBST(MOZ_TIMER_LIBS)
|
AC_SUBST(MOZ_TIMER_LIBS)
|
||||||
AC_SUBST(MOZ_JS_LIBS)
|
AC_SUBST(MOZ_JS_LIBS)
|
||||||
|
|
|
@ -113,6 +113,10 @@ ifdef MOZ_MATHML
|
||||||
INCLUDES += -I$(srcdir)/../mathml/content/src
|
INCLUDES += -I$(srcdir)/../mathml/content/src
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_SVG
|
||||||
|
INCLUDES += -I$(srcdir)/../svg/content/src
|
||||||
|
endif
|
||||||
|
|
||||||
$(BUILD_DATE):
|
$(BUILD_DATE):
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
$(PERL) $(srcdir)/gbdate.pl > $@
|
$(PERL) $(srcdir)/gbdate.pl > $@
|
||||||
|
|
|
@ -32,6 +32,7 @@ LIBRARY_NAME = raptorsvgbase_s
|
||||||
CPPSRCS = \
|
CPPSRCS = \
|
||||||
nsSVGContainerFrame.cpp \
|
nsSVGContainerFrame.cpp \
|
||||||
nsPolygonFrame.cpp \
|
nsPolygonFrame.cpp \
|
||||||
|
nsPolylineFrame.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
|
|
Загрузка…
Ссылка в новой задаче