diff options
| -rw-r--r-- | Build/source/libs/cairo/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/cairo/Makefile.am | 25 | ||||
| -rw-r--r-- | Build/source/libs/cairo/Makefile.in | 58 | ||||
| -rw-r--r-- | Build/source/libs/cairo/cairo/Makefile.am | 32 | ||||
| -rw-r--r-- | Build/source/libs/cairo/cairo/Makefile.in | 18 | ||||
| -rwxr-xr-x | Build/source/libs/cairo/configure | 14 | ||||
| -rw-r--r-- | Build/source/libs/cairo/configure.ac | 1 |
7 files changed, 87 insertions, 65 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index b7e8db1bd57..bb16dcdb629 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,3 +1,7 @@ +2013-10-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac, cairo/Makefile.am: Prepare for SVG. + 2013-10-29 Peter Breitenlohner <peb@mppmu.mpg.de> * cairotst.c: Print more info. diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am index f8be9a16d5b..107e7380e10 100644 --- a/Build/source/libs/cairo/Makefile.am +++ b/Build/source/libs/cairo/Makefile.am @@ -134,12 +134,6 @@ libcairo_a_SOURCES = \ @CAIRO_TREE@/src/cairo-version.c \ @CAIRO_TREE@/src/cairo-wideint.c -if NEVER -libcairo_a_SOURCES += \ - $(NULL) -endif NEVER - - if CAIRO_HAS_XLIB_SURFACE libcairo_a_SOURCES += \ @CAIRO_TREE@/src/cairo-xlib-display.c \ @@ -181,28 +175,23 @@ libcairo_a_SOURCES += \ endif CAIRO_HAS_XCB_SURFACE if CAIRO_HAS_QUARTZ_SURFACE -libcairo_a_SOURCES += \ - @CAIRO_TREE@/src/cairo-quartz-surface.c +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-quartz-surface.c endif CAIRO_HAS_QUARTZ_SURFACE if CAIRO_HAS_QUARTZ_FONT -libcairo_a_SOURCES += - @CAIRO_TREE@/src/cairo-quartz-font.c +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-quartz-font.c endif CAIRO_HAS_QUARTZ_FONT if CAIRO_HAS_QUARTZ_IMAGE_SURFACE -libcairo_a_SOURCES += \ - @CAIRO_TREE@/src/cairo-quartz-image-surface.c +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-quartz-image-surface.c endif CAIRO_HAS_QUARTZ_IMAGE_SURFACE if CAIRO_HAS_OS2_SURFACE -libcairo_a_SOURCES += \ - @CAIRO_TREE@/src/cairo-os2-surface.c +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-os2-surface.c endif CAIRO_HAS_OS2_SURFACE if CAIRO_HAS_PNG_FUNCTIONS -libcairo_a_SOURCES += \ - @CAIRO_TREE@/src/cairo-png.c +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-png.c endif CAIRO_HAS_PNG_FUNCTIONS if CAIRO_HAS_GL_SURFACE @@ -222,6 +211,10 @@ libcairo_a_SOURCES += \ @CAIRO_TREE@/src/cairo-gl-surface.c endif CAIRO_HAS_GL_SURFACE +if CAIRO_HAS_SVG_SURFACE +libcairo_a_SOURCES += @CAIRO_TREE@/src/cairo-svg-surface.c +endif CAIRO_HAS_SVG_SURFACE + $(libcairo_a_OBJECTS): config.force if build diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index ca2de9b3603..9eaf34f59af 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -78,10 +78,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@NEVER_TRUE@am__append_1 = \ -@NEVER_TRUE@ $(NULL) - -@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_2 = \ +@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_1 = \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-display.c \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-core-compositor.c \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-fallback-compositor.c \ @@ -93,7 +90,7 @@ host_triplet = @host@ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-visual.c \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-xcb-surface.c -@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_3 = \ +@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_2 = \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection.c \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-core.c \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-render.c \ @@ -104,7 +101,7 @@ host_triplet = @host@ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-core.c \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-render.c -@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_4 = \ +@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_3 = \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection.c \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-core.c \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-render.c \ @@ -115,20 +112,12 @@ host_triplet = @host@ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-core.c \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-render.c -@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_5 = \ -@CAIRO_HAS_QUARTZ_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-quartz-surface.c - -@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_6 = -@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_7 = \ -@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-quartz-image-surface.c - -@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_8 = \ -@CAIRO_HAS_OS2_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-os2-surface.c - -@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_9 = \ -@CAIRO_HAS_PNG_FUNCTIONS_TRUE@ @CAIRO_TREE@/src/cairo-png.c - -@CAIRO_HAS_GL_SURFACE_TRUE@am__append_10 = \ +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_4 = @CAIRO_TREE@/src/cairo-quartz-surface.c +@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_5 = @CAIRO_TREE@/src/cairo-quartz-font.c +@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_6 = @CAIRO_TREE@/src/cairo-quartz-image-surface.c +@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_7 = @CAIRO_TREE@/src/cairo-os2-surface.c +@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_8 = @CAIRO_TREE@/src/cairo-png.c +@CAIRO_HAS_GL_SURFACE_TRUE@am__append_9 = \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-composite.c \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-device.c \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-dispatch.c \ @@ -143,6 +132,7 @@ host_triplet = @host@ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-source.c \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-surface.c +@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_10 = @CAIRO_TREE@/src/cairo-svg-surface.c @build_TRUE@check_PROGRAMS = cairotst$(EXEEXT) DIST_COMMON = $(srcdir)/../../am/reconfig.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ @@ -301,6 +291,7 @@ am__libcairo_a_SOURCES_DIST = \ @CAIRO_TREE@/src/cairo-xcb-surface-core.c \ @CAIRO_TREE@/src/cairo-xcb-surface-render.c \ @CAIRO_TREE@/src/cairo-quartz-surface.c \ + @CAIRO_TREE@/src/cairo-quartz-font.c \ @CAIRO_TREE@/src/cairo-quartz-image-surface.c \ @CAIRO_TREE@/src/cairo-os2-surface.c \ @CAIRO_TREE@/src/cairo-png.c \ @@ -316,10 +307,10 @@ am__libcairo_a_SOURCES_DIST = \ @CAIRO_TREE@/src/cairo-gl-spans-compositor.c \ @CAIRO_TREE@/src/cairo-gl-traps-compositor.c \ @CAIRO_TREE@/src/cairo-gl-source.c \ - @CAIRO_TREE@/src/cairo-gl-surface.c + @CAIRO_TREE@/src/cairo-gl-surface.c \ + @CAIRO_TREE@/src/cairo-svg-surface.c am__dirstamp = $(am__leading_dot)dirstamp -am__objects_1 = -@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_2 = @CAIRO_TREE@/src/cairo-xlib-display.$(OBJEXT) \ +@CAIRO_HAS_XLIB_SURFACE_TRUE@am__objects_1 = @CAIRO_TREE@/src/cairo-xlib-display.$(OBJEXT) \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-core-compositor.$(OBJEXT) \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-fallback-compositor.$(OBJEXT) \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-render-compositor.$(OBJEXT) \ @@ -329,7 +320,7 @@ am__objects_1 = @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-surface-shm.$(OBJEXT) \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-visual.$(OBJEXT) \ @CAIRO_HAS_XLIB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xlib-xcb-surface.$(OBJEXT) -@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__objects_3 = @CAIRO_TREE@/src/cairo-xcb-connection.$(OBJEXT) \ +@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__objects_2 = @CAIRO_TREE@/src/cairo-xcb-connection.$(OBJEXT) \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-core.$(OBJEXT) \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-render.$(OBJEXT) \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-shm.$(OBJEXT) \ @@ -338,7 +329,7 @@ am__objects_1 = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface.$(OBJEXT) \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-core.$(OBJEXT) \ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-render.$(OBJEXT) -@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_4 = @CAIRO_TREE@/src/cairo-xcb-connection.$(OBJEXT) \ +@CAIRO_HAS_XCB_SURFACE_TRUE@am__objects_3 = @CAIRO_TREE@/src/cairo-xcb-connection.$(OBJEXT) \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-core.$(OBJEXT) \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-render.$(OBJEXT) \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-connection-shm.$(OBJEXT) \ @@ -347,7 +338,8 @@ am__objects_1 = @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface.$(OBJEXT) \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-core.$(OBJEXT) \ @CAIRO_HAS_XCB_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-xcb-surface-render.$(OBJEXT) -@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_5 = @CAIRO_TREE@/src/cairo-quartz-surface.$(OBJEXT) +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__objects_4 = @CAIRO_TREE@/src/cairo-quartz-surface.$(OBJEXT) +@CAIRO_HAS_QUARTZ_FONT_TRUE@am__objects_5 = @CAIRO_TREE@/src/cairo-quartz-font.$(OBJEXT) @CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__objects_6 = @CAIRO_TREE@/src/cairo-quartz-image-surface.$(OBJEXT) @CAIRO_HAS_OS2_SURFACE_TRUE@am__objects_7 = @CAIRO_TREE@/src/cairo-os2-surface.$(OBJEXT) @CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__objects_8 = @CAIRO_TREE@/src/cairo-png.$(OBJEXT) @@ -364,6 +356,7 @@ am__objects_1 = @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-traps-compositor.$(OBJEXT) \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-source.$(OBJEXT) \ @CAIRO_HAS_GL_SURFACE_TRUE@ @CAIRO_TREE@/src/cairo-gl-surface.$(OBJEXT) +@CAIRO_HAS_SVG_SURFACE_TRUE@am__objects_10 = @CAIRO_TREE@/src/cairo-svg-surface.$(OBJEXT) am_libcairo_a_OBJECTS = \ @CAIRO_TREE@/src/cairo-analysis-surface.$(OBJEXT) \ @CAIRO_TREE@/src/cairo-arc.$(OBJEXT) \ @@ -470,8 +463,8 @@ am_libcairo_a_OBJECTS = \ @CAIRO_TREE@/src/cairo-version.$(OBJEXT) \ @CAIRO_TREE@/src/cairo-wideint.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_1) $(am__objects_6) \ - $(am__objects_7) $(am__objects_8) $(am__objects_9) + $(am__objects_5) $(am__objects_6) $(am__objects_7) \ + $(am__objects_8) $(am__objects_9) $(am__objects_10) libcairo_a_OBJECTS = $(am_libcairo_a_OBJECTS) am_cairotst_OBJECTS = cairotst-cairotst.$(OBJEXT) cairotst_OBJECTS = $(am_cairotst_OBJECTS) @@ -1464,6 +1457,9 @@ clean-noinstLIBRARIES: @CAIRO_TREE@/src/cairo-quartz-surface.$(OBJEXT): \ @CAIRO_TREE@/src/$(am__dirstamp) \ @CAIRO_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@CAIRO_TREE@/src/cairo-quartz-font.$(OBJEXT): \ + @CAIRO_TREE@/src/$(am__dirstamp) \ + @CAIRO_TREE@/src/$(DEPDIR)/$(am__dirstamp) @CAIRO_TREE@/src/cairo-quartz-image-surface.$(OBJEXT): \ @CAIRO_TREE@/src/$(am__dirstamp) \ @CAIRO_TREE@/src/$(DEPDIR)/$(am__dirstamp) @@ -1512,6 +1508,9 @@ clean-noinstLIBRARIES: @CAIRO_TREE@/src/cairo-gl-surface.$(OBJEXT): \ @CAIRO_TREE@/src/$(am__dirstamp) \ @CAIRO_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@CAIRO_TREE@/src/cairo-svg-surface.$(OBJEXT): \ + @CAIRO_TREE@/src/$(am__dirstamp) \ + @CAIRO_TREE@/src/$(DEPDIR)/$(am__dirstamp) libcairo.a: $(libcairo_a_OBJECTS) $(libcairo_a_DEPENDENCIES) $(EXTRA_libcairo_a_DEPENDENCIES) $(AM_V_at)-rm -f libcairo.a @@ -1618,6 +1617,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-polygon-intersect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-polygon-reduce.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-polygon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-quartz-font.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-quartz-image-surface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-quartz-surface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-raster-source-pattern.Po@am__quote@ @@ -1642,6 +1642,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-surface-subsurface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-surface-wrapper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-surface.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-svg-surface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-time.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-tor-scan-converter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@CAIRO_TREE@/src/$(DEPDIR)/cairo-tor22-scan-converter.Po@am__quote@ @@ -2298,7 +2299,6 @@ uninstall-am: # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'` -@CAIRO_HAS_QUARTZ_FONT_TRUE@ @CAIRO_TREE@/src/cairo-quartz-font.c $(libcairo_a_OBJECTS): config.force diff --git a/Build/source/libs/cairo/cairo/Makefile.am b/Build/source/libs/cairo/cairo/Makefile.am index 81b7e6ff456..1f15b12c11c 100644 --- a/Build/source/libs/cairo/cairo/Makefile.am +++ b/Build/source/libs/cairo/cairo/Makefile.am @@ -15,5 +15,37 @@ hdr_links = \ $(CAIRO_BLD)/cairo-features.h \ $(CAIRO_SRC)/cairo-version.h +if CAIRO_HAS_XLIB_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-xlib.h +endif CAIRO_HAS_XLIB_SURFACE + +if CAIRO_HAS_XLIB_XRENDER_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-xlib-xrender.h +endif CAIRO_HAS_XLIB_XRENDER_SURFACE + +if CAIRO_HAS_XCB_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-xcb.h +endif CAIRO_HAS_XCB_SURFACE + +if CAIRO_HAS_QUARTZ_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-quartz.h +endif CAIRO_HAS_QUARTZ_SURFACE + +if CAIRO_HAS_QUARTZ_IMAGE_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-quartz-image.h +endif CAIRO_HAS_QUARTZ_IMAGE_SURFACE + +if CAIRO_HAS_OS2_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-os2.h +endif CAIRO_HAS_OS2_SURFACE + +if CAIRO_HAS_GL_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-gl.h +endif CAIRO_HAS_GL_SURFACE + +if CAIRO_HAS_SVG_SURFACE +hdr_links += $(CAIRO_SRC)/src/cairo-svg.h +endif CAIRO_HAS_SVG_SURFACE + include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/cairo/cairo/Makefile.in b/Build/source/libs/cairo/cairo/Makefile.in index 67ba6e5b313..a007263f0c6 100644 --- a/Build/source/libs/cairo/cairo/Makefile.in +++ b/Build/source/libs/cairo/cairo/Makefile.in @@ -77,6 +77,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_1 = $(CAIRO_SRC)/src/cairo-xlib.h +@CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_2 = $(CAIRO_SRC)/src/cairo-xlib-xrender.h +@CAIRO_HAS_XCB_SURFACE_TRUE@am__append_3 = $(CAIRO_SRC)/src/cairo-xcb.h +@CAIRO_HAS_QUARTZ_SURFACE_TRUE@am__append_4 = $(CAIRO_SRC)/src/cairo-quartz.h +@CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TRUE@am__append_5 = $(CAIRO_SRC)/src/cairo-quartz-image.h +@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_6 = $(CAIRO_SRC)/src/cairo-os2.h +@CAIRO_HAS_GL_SURFACE_TRUE@am__append_7 = $(CAIRO_SRC)/src/cairo-gl.h +@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_8 = $(CAIRO_SRC)/src/cairo-svg.h DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = cairo @@ -222,12 +230,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ CAIRO_SRC = $(top_srcdir)/$(CAIRO_TREE) CAIRO_BLD = $(top_builddir) -hdr_links = \ - $(CAIRO_SRC)/src/cairo.h \ +hdr_links = $(CAIRO_SRC)/src/cairo.h \ $(CAIRO_SRC)/src/cairo-deprecated.h \ - $(CAIRO_BLD)/cairo-features.h \ - $(CAIRO_SRC)/cairo-version.h - + $(CAIRO_BLD)/cairo-features.h $(CAIRO_SRC)/cairo-version.h \ + $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) $(am__append_6) \ + $(am__append_7) $(am__append_8) all: all-am .SUFFIXES: diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure index 434072d3920..fd63bc8ceca 100755 --- a/Build/source/libs/cairo/configure +++ b/Build/source/libs/cairo/configure @@ -640,8 +640,6 @@ build_os build_vendor build_cpu build -NEVER_FALSE -NEVER_TRUE CAIRO_HAS_GL_SURFACE_FALSE CAIRO_HAS_GL_SURFACE_TRUE CAIRO_HAS_OS2_SURFACE_FALSE @@ -6349,14 +6347,6 @@ else CAIRO_HAS_GL_SURFACE_FALSE= fi - if false; then - NEVER_TRUE= - NEVER_FALSE='#' -else - NEVER_TRUE='#' - NEVER_FALSE= -fi - ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` @@ -6832,10 +6822,6 @@ if test -z "${CAIRO_HAS_GL_SURFACE_TRUE}" && test -z "${CAIRO_HAS_GL_SURFACE_FAL as_fn_error $? "conditional \"CAIRO_HAS_GL_SURFACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${NEVER_TRUE}" && test -z "${NEVER_FALSE}"; then - as_fn_error $? "conditional \"NEVER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac index e4bfc161e88..96c2c418fd7 100644 --- a/Build/source/libs/cairo/configure.ac +++ b/Build/source/libs/cairo/configure.ac @@ -77,7 +77,6 @@ dnl AM_CONDITIONAL([CAIRO_HAS_QUARTZ_IMAGE_SURFACE], [false]) AM_CONDITIONAL([CAIRO_HAS_OS2_SURFACE], [false]) AM_CONDITIONAL([CAIRO_HAS_GL_SURFACE], [false]) -AM_CONDITIONAL([NEVER], [false]) KPSE_PIXMAN_FLAGS |