Attachment 5916 Details for Bug 7234 – another patch

[patch] another patch

features.patch (text/plain), 2.99 KB, created by Yevgen Muntyan on 2006-06-15 02:01:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yevgen Muntyan

Created: 2006-06-15 02:01:46 UTC

Size: 2.99 KB

patch

obsolete

>diff --git a/configure.in b/configure.in
>index cbe6a7f..782b51c 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -129,7 +129,7 @@ AC_DEFUN([CAIRO_BACKEND_ENABLE],
> 	    esac
> 	    if test "x$use_$1" = xyes; then
> 	      AC_MSG_NOTICE([creating src/cairo-$4.pc])
>-	      mkdir src
>+	      mkdir -p src
> 	      AS_IF([sed \
> 			-e "s/@backend_name@/$4/g" \
> 			-e "s/@Backend_Name@/$2/g" \
>@@ -732,7 +732,6 @@ Makefile
> pixman/Makefile
> pixman/src/Makefile
> src/Makefile
>-src/cairo-features.h
> test/Makefile
> doc/Makefile
> doc/public/Makefile
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 4bada6b..d615234 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -133,7 +133,6 @@ XRENDER_LIBS=@XRENDER_LIBS@
> cairoincludedir = $(includedir)/cairo
> cairoinclude_HEADERS =			\
> 	cairo.h				\
>-	cairo-features.h		\
> 	$(libcairo_atsui_headers)	\
> 	$(libcairo_ft_headers)		\
> 	$(libcairo_glitz_headers)	\
>@@ -156,6 +155,7 @@ libcairo_la_SOURCES =				\
> 	cairo-arc.c				\
> 	cairo-arc-private.h			\
> 	cairo-array.c				\
>+	cairo-output-stream-private.h		\
> 	cairo-base85-stream.c			\
> 	cairo-cache.c				\
> 	cairo-cache-private.h			\
>@@ -232,7 +232,21 @@ libcairo_la_DEPENDENCIES = $(cairo_def_d
> pkgconfigdir = $(libdir)/pkgconfig
> pkgconfig_DATA = cairo.pc $(backend_pkgconfigs)
> DISTCLEANFILES = $(backend_pkgconfigs)
>-EXTRA_DIST = cairo-backend.pc.in
>+EXTRA_DIST = cairo-backend.pc.in cairo-features.h.in
>+
>+cairo-features.h: stamp-cairo-features.h
>+	@if test -f stamp-cairo-features.h; then :; \
>+	else $(MAKE) stamp-cairo-features.h; fi
>+stamp-cairo-features.h: $(top_builddir)/config.status $(srcdir)/cairo-features.h.in
>+	cp $(srcdir)/cairo-features.h.in stamp-cairo-features.h.in && \
>+	cd $(top_builddir) && $(SHELL) ./config.status --file=src/stamp-cairo-features.h
>+	rm -f stamp-cairo-features.h.in
>+	if cmp -s stamp-cairo-features.h cairo-features.h; then : ; \
>+	else echo "Creating cairo-features.h" ; \
>+	cp stamp-cairo-features.h cairo-features.h; fi
>+DISTCLEANFILES += stamp-cairo-features.h stamp-cairo-features.h.in cairo-features.h
>+BUILT_SOURCES = cairo-features.h
>+nodist_libcairo_la_SOURCES = cairo-features.h
> 
> 
> cairo.def: $(cairo_win32_api_headers)
>@@ -246,7 +260,7 @@ cairo.def: $(cairo_win32_api_headers)
> 	echo LIBRARY libcairo-$(LT_CURRENT_MINUS_AGE).dll; \
> 	) >$@
> 
>-install-data-local:
>+install-data-local: cairo-features.h
> 	@if test -f "$(DESTDIR)$(includedir)/cairo.h" || test -f "$(DESTDIR)$(includedir)/cairo-features.h" ; then \
> 	  echo "****************************************************************" ;	\
> 	  echo "*** Error: Old headers found. You should remove the following" ;	\
>@@ -254,6 +268,10 @@ install-data-local:
> 	  ls $(includedir)/cairo*.h ;							\
> 	  echo "****************************************************************" ;	\
> 	  false ;									\
>-        fi
>+	fi
>+	$(mkinstalldirs) $(DESTDIR)$(cairoincludedir)
>+	file=$(DESTDIR)$(cairoincludedir)/cairo-features.h; \
>+	if test -r $$file && cmp -s cairo-features.h $$file; then :; \
>+	else $(INSTALL_DATA) cairo-features.h $$file; fi
> 
> CLEANFILES = cairo.def

Actions: View | Splinter Review

Attachments on bug 7234: 5915 | 5916

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.