2008-01-10 Alp Toker <alp@atoker.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Jan 2008 00:55:03 +0000 (00:55 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Jan 2008 00:55:03 +0000 (00:55 +0000)
        SVG font build fix for GTK+/autotools.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/ChangeLog
WebCore/GNUmakefile.am
configure.ac

index 471b91d..8fd858f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-10  Alp Toker  <alp@atoker.com>
+
+        SVG font build fix for GTK+/autotools.
+
+        * configure.ac:
+
 2008-01-05  Alp Toker  <alp@atoker.com>
 
         Rubber-stamped by Mark Rowe.
index d0e7a99..20f0fe0 100644 (file)
@@ -1,3 +1,9 @@
+2008-01-10  Alp Toker  <alp@atoker.com>
+
+        SVG font build fix for GTK+/autotools.
+
+        * GNUmakefile.am:
+
 2008-01-10  Adam Barth  <hk9565@gmail.com>
 
         Reviewed by Sam Weinig and Anders Carlsson.
index 63adf8b..f6f7c90 100644 (file)
@@ -1448,6 +1448,7 @@ webcore_built_sources += \
        DerivedSources/JSSVGFETileElement.cpp \
        DerivedSources/JSSVGFETurbulenceElement.cpp \
        DerivedSources/JSSVGFilterElement.cpp \
+       DerivedSources/JSSVGFontElement.cpp \
        DerivedSources/JSSVGFontFaceElement.cpp \
        DerivedSources/JSSVGFontFaceFormatElement.cpp \
        DerivedSources/JSSVGFontFaceNameElement.cpp \
@@ -1455,6 +1456,7 @@ webcore_built_sources += \
        DerivedSources/JSSVGFontFaceUriElement.cpp \
        DerivedSources/JSSVGForeignObjectElement.cpp \
        DerivedSources/JSSVGGElement.cpp \
+       DerivedSources/JSSVGGlyphElement.cpp \
        DerivedSources/JSSVGGradientElement.cpp \
        DerivedSources/JSSVGImageElement.cpp \
        DerivedSources/JSSVGLengthList.cpp \
@@ -1462,6 +1464,7 @@ webcore_built_sources += \
        DerivedSources/JSSVGLinearGradientElement.cpp \
        DerivedSources/JSSVGMaskElement.cpp \
        DerivedSources/JSSVGMarkerElement.cpp \
+       DerivedSources/JSSVGMissingGlyphElement.cpp \
        DerivedSources/JSSVGZoomEvent.cpp
 
 IDL_BINDINGS += \
@@ -1826,31 +1829,41 @@ DerivedSources/CSSValueKeywords.h : $(WebCore)/css/CSSValueKeywords.in $(WebCore
 
 # SVG Features
 if ENABLE_SVG_USE
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_USE=1
 SVG_FEATURES += ENABLE_SVG_USE=1
+webcore_cppflags += -DENABLE_SVG_USE=1
 endif
 
 if ENABLE_SVG_FONTS
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FONTS=1
 SVG_FEATURES += ENABLE_SVG_FONTS=1
+webcore_cppflags += -DENABLE_SVG_FONTS=1
 endif
 
 if ENABLE_SVG_FILTERS
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FILTERS=1
 SVG_FEATURES += ENABLE_SVG_FILTERS=1
+webcore_cppflags += -DENABLE_SVG_FILTERS=1
 endif
 
 if ENABLE_SVG_AS_IMAGE
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_AS_IMAGE=1
 SVG_FEATURES += ENABLE_SVG_AS_IMAGE=1
+webcore_cppflags += -DENABLE_SVG_AS_IMAGE=1
 endif
 
 if ENABLE_SVG_ANIMATION
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_ANIMATION=1
 SVG_FEATURES += ENABLE_SVG_ANIMATION=1
+webcore_cppflags += -DENABLE_SVG_ANIMATION=1
 endif
 
 # SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)
-DerivedSources/SVGNames.cpp: DerivedSources/SVGElementFactory.cpp
+DerivedSources/SVGNames.cpp: DerivedSources/SVGElementFactory.cpp;
 
 if SVG_FLAGS
 DerivedSources/SVGElementFactory.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/svg/svgtags.in $(WebCore)/svg/svgattrs.in
-       $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" \
+       $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FEATURES)" \
        --namespace SVG --cppNamespace WebCore --namespaceURI "http://www.w3.org/2000/svg" --factory --attrsNullNamespace --output $(GENSOURCES)
 else
 DerivedSources/SVGElementFactory.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/svg/svgtags.in $(WebCore)/svg/svgattrs.in
index 136b871..bddd36c 100644 (file)
@@ -313,16 +313,16 @@ if test "$enable_coverage" = "yes"; then
 fi
 
 # check for SVG features, enabling SVG if necessary
-if test "$enable_svg" = "no" && (\
-   test "$enable_svg_animation" = "yes" || \
+if test "$enable_svg_animation" = "yes" || \
    test "$enable_svg_filters" = "yes" || \
    test "$enable_svg_fonts" = "yes" || \
    test "$enable_svg_as_image" = "yes" || \
-   test "$enable_svg_use_element" = "yes"); then
-
-   AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
-   enable_svg = yes
-   svg_flags = yes
+   test "$enable_svg_use_element" = "yes"; then
+   svg_flags=yes
+   if test "$enable_svg" = "no"; then
+       AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
+       enable_svg=yes
+   fi
 fi
 
 # OS conditionals