[cairo-commit] 12 commits - build/configure.ac.features build/Makefile.am.gtk-doc build/shave.in doc/public src/cairo.h src/cairoint.h src/cairo-path-stroke.c src/cairo-skiplist.c src/Makefile.am.analysis util/cairo-script

Chris Wilson ickle at kemper.freedesktop.org
Fri May 8 01:20:56 PDT 2009


 build/Makefile.am.gtk-doc                  |    4 ++--
 build/configure.ac.features                |    1 +
 build/shave.in                             |    3 +++
 doc/public/tmpl/cairo-status.sgml          |    3 ++-
 src/Makefile.am.analysis                   |    2 +-
 src/cairo-path-stroke.c                    |    1 +
 src/cairo-skiplist.c                       |    2 ++
 src/cairo.h                                |    8 ++++----
 src/cairoint.h                             |    6 +++---
 util/cairo-script/cairo-script-file.c      |    3 ++-
 util/cairo-script/cairo-script-objects.c   |    3 ++-
 util/cairo-script/cairo-script-operators.c |   15 ++++++++-------
 util/cairo-script/cairo-script-private.h   |    8 ++++----
 util/cairo-script/cairo-script-scanner.c   |    5 +++--
 util/cairo-script/cairo-script-stack.c     |    7 ++++---
 15 files changed, 42 insertions(+), 29 deletions(-)

New commits:
commit 088d2a6cc70b01f55d178d235542247180b3e5ee
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 11:35:17 2009 +0100

    [doc] Update identifiers

diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index e8ad969..aed8aa6 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -71,7 +71,8 @@ code is required before or after each individual cairo function call.
 @CAIRO_STATUS_INVALID_SLANT: 
 @CAIRO_STATUS_INVALID_WEIGHT: 
 @CAIRO_STATUS_INVALID_SIZE: 
- at CAIRO_STATUS_LAST_STATUS:
+ at CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: 
+ at CAIRO_STATUS_LAST_STATUS: 
 
 <!-- ##### FUNCTION cairo_status_to_string ##### -->
 <para>
commit d8fb6a03d3034cf776687bcc1f0625a8a9f2ae07
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:57:13 2009 +0100

    [path] Define _BSD_SOURCE to enable hypot()
    
    hypot() is only declared for BSD/SVID/XOPEN/C99 sources. Choose BSD as
    we've used that elsewhere.

diff --git a/src/cairo-path-stroke.c b/src/cairo-path-stroke.c
index 37ac79c..79bf09b 100644
--- a/src/cairo-path-stroke.c
+++ b/src/cairo-path-stroke.c
@@ -35,6 +35,7 @@
  *	Carl D. Worth <cworth at cworth.org>
  */
 
+#define _BSD_SOURCE /* for hypot() */
 #include "cairoint.h"
 #include "cairo-path-fixed-private.h"
 
commit e38f85c5de51016b8858e755e2752816c9995ab2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:42:15 2009 +0100

    [script] Pedantic violations
    
    Fixup a few trivial errors with -pedantic.

diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index a39fbef..0ed3dd3 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -5416,7 +5416,7 @@ _debug_print (csi_t *ctx)
 	fprintf (stderr, "name: %s\n", (char *) obj->datum.name);
 	break;
     case CSI_OBJECT_TYPE_OPERATOR:
-	fprintf (stderr, "operator: %p\n", obj->datum.op);
+	fprintf (stderr, "operator: %p\n", obj->datum.ptr);
 	break;
     case CSI_OBJECT_TYPE_REAL:
 	fprintf (stderr, "real: %g\n", obj->datum.real);
diff --git a/util/cairo-script/cairo-script-private.h b/util/cairo-script/cairo-script-private.h
index f74cb49..d2ebc0c 100644
--- a/util/cairo-script/cairo-script-private.h
+++ b/util/cairo-script/cairo-script-private.h
@@ -247,7 +247,7 @@ typedef enum {
     CSI_OBJECT_TYPE_FONT,
     CSI_OBJECT_TYPE_PATTERN,
     CSI_OBJECT_TYPE_SCALED_FONT,
-    CSI_OBJECT_TYPE_SURFACE,
+    CSI_OBJECT_TYPE_SURFACE
 } csi_object_type_t;
 
 #define CSI_OBJECT_IS_ATOM(OBJ) (((OBJ)->type & CSI_OBJECT_TYPE_MASK) < 0x08)
@@ -256,7 +256,7 @@ typedef enum {
 
 enum { /* attributes */
     CSI_OBJECT_ATTR_EXECUTABLE = 1 << 6,
-    CSI_OBJECT_ATTR_WRITABLE   = 1 << 7,
+    CSI_OBJECT_ATTR_WRITABLE   = 1 << 7
 };
 #define CSI_OBJECT_ATTR_MASK (CSI_OBJECT_ATTR_EXECUTABLE | \
 			      CSI_OBJECT_ATTR_WRITABLE)
@@ -400,7 +400,7 @@ struct _csi_file {
 	STDIO,
 	BYTES,
 	PROCEDURE,
-	FILTER,
+	FILTER
     } type;
     void *src;
     void *data;
@@ -429,7 +429,7 @@ struct _csi_scanner {
 	COMMENT,
 	STRING,
 	HEX,
-	BASE85,
+	BASE85
     } state;
 
     csi_buffer_t buffer;
commit 0c00556990a842e0ee0056134c6e196c2fb372b7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:11:12 2009 +0100

    [script] Missing include for INT32_MAX
    
    Avoid depending upon stdint.h, or rather cut'n'pasting Cairo's portable
    defines, by using INT_MAX and limits.h instead.

diff --git a/util/cairo-script/cairo-script-file.c b/util/cairo-script/cairo-script-file.c
index fcdccf1..9a3ff70 100644
--- a/util/cairo-script/cairo-script-file.c
+++ b/util/cairo-script/cairo-script-file.c
@@ -35,6 +35,7 @@
 #include "cairo-script-private.h"
 
 #include <stdio.h>
+#include <limits.h> /* INT_MAX */
 #include <string.h>
 
 #define CHUNK_SIZE 32768
@@ -996,7 +997,7 @@ _csi_file_as_string (csi_t *ctx,
 	    char *newbytes;
 	    int newlen;
 
-	    if (_csi_unlikely (allocated > INT32_MAX / 2))
+	    if (_csi_unlikely (allocated > INT_MAX / 2))
 		return _csi_error (CAIRO_STATUS_NO_MEMORY);
 
 	    newlen = allocated * 2;
diff --git a/util/cairo-script/cairo-script-objects.c b/util/cairo-script/cairo-script-objects.c
index 552241f..2e81df4 100644
--- a/util/cairo-script/cairo-script-objects.c
+++ b/util/cairo-script/cairo-script-objects.c
@@ -34,6 +34,7 @@
 
 #include "cairo-script-private.h"
 
+#include <limits.h> /* INT_MAX */
 #include <string.h>
 
 csi_status_t
@@ -523,7 +524,7 @@ csi_string_new (csi_t *ctx,
 
     if (len < 0)
 	len = strlen (str);
-    if (_csi_unlikely (len >= INT32_MAX))
+    if (_csi_unlikely (len >= INT_MAX))
 	return _csi_error (CSI_STATUS_NO_MEMORY);
 
     if (ctx->free_string == NULL || ctx->free_string->len <= len) {
diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index d2bdb4c..a39fbef 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -39,6 +39,7 @@
 #include <stdio.h> /* snprintf */
 #include <string.h>
 #include <math.h>
+#include <limits.h> /* INT_MAX */
 #include <assert.h>
 
 typedef struct _csi_proxy {
@@ -2136,7 +2137,7 @@ _glyph_path (csi_t *ctx)
     }
 
     if (nglyphs > ARRAY_LENGTH (stack_glyphs)) {
-	if (_csi_unlikely ((unsigned) nglyphs >= INT32_MAX / sizeof (cairo_glyph_t)))
+	if (_csi_unlikely ((unsigned) nglyphs >= INT_MAX / sizeof (cairo_glyph_t)))
 	    return _csi_error (CSI_STATUS_NO_MEMORY);
 	glyphs = _csi_alloc (ctx, sizeof (cairo_glyph_t) * nglyphs);
 	if (_csi_unlikely (glyphs == NULL))
@@ -3898,7 +3899,7 @@ _set_dash (csi_t *ctx)
 	if (_csi_likely (array->stack.len < ARRAY_LENGTH (stack_dashes))) {
 	    dashes = stack_dashes;
 	} else {
-	if (_csi_unlikely ((unsigned) array->stack.len >= INT32_MAX / sizeof (double)))
+	if (_csi_unlikely ((unsigned) array->stack.len >= INT_MAX / sizeof (double)))
 	    return _csi_error (CSI_STATUS_NO_MEMORY);
 	    dashes = _csi_alloc (ctx, sizeof (double) * array->stack.len);
 	    if (_csi_unlikely (dashes == NULL))
@@ -4734,7 +4735,7 @@ _show_glyphs (csi_t *ctx)
     }
 
     if (nglyphs > ARRAY_LENGTH (stack_glyphs)) {
-	if (_csi_unlikely ((unsigned) nglyphs >= INT32_MAX / sizeof (cairo_glyph_t)))
+	if (_csi_unlikely ((unsigned) nglyphs >= INT_MAX / sizeof (cairo_glyph_t)))
 	    return _csi_error (CSI_STATUS_NO_MEMORY);
 	glyphs = _csi_alloc (ctx, sizeof (cairo_glyph_t) * nglyphs);
 	if (_csi_unlikely (glyphs == NULL))
@@ -4880,7 +4881,7 @@ _show_text_glyphs (csi_t *ctx)
 	array = obj->datum.array;
 	nclusters = array->stack.len / 2;
 	if (nclusters > ARRAY_LENGTH (stack_clusters)) {
-	    if (_csi_unlikely ((unsigned) nclusters >= INT32_MAX / sizeof (cairo_text_cluster_t)))
+	    if (_csi_unlikely ((unsigned) nclusters >= INT_MAX / sizeof (cairo_text_cluster_t)))
 		return _csi_error (CSI_STATUS_NO_MEMORY);
 	    clusters = _csi_alloc (ctx, sizeof (cairo_text_cluster_t) * nclusters);
 	    if (_csi_unlikely (clusters == NULL))
@@ -4898,7 +4899,7 @@ _show_text_glyphs (csi_t *ctx)
 	string = obj->datum.string;
 	nclusters = string->len / 2;
 	if (nclusters > ARRAY_LENGTH (stack_clusters)) {
-	    if (_csi_unlikely ((unsigned) nclusters >= INT32_MAX / sizeof (cairo_text_cluster_t)))
+	    if (_csi_unlikely ((unsigned) nclusters >= INT_MAX / sizeof (cairo_text_cluster_t)))
 		return _csi_error (CSI_STATUS_NO_MEMORY);
 	    clusters = _csi_alloc (ctx, sizeof (cairo_text_cluster_t) * nclusters);
 	    if (_csi_unlikely (clusters == NULL))
@@ -4943,7 +4944,7 @@ _show_text_glyphs (csi_t *ctx)
 	return CSI_STATUS_SUCCESS;
 
     if (nglyphs > ARRAY_LENGTH (stack_glyphs)) {
-	    if (_csi_unlikely ((unsigned) nglyphs >= INT32_MAX / sizeof (cairo_glyph_t)))
+	    if (_csi_unlikely ((unsigned) nglyphs >= INT_MAX / sizeof (cairo_glyph_t)))
 		return _csi_error (CSI_STATUS_NO_MEMORY);
 	glyphs = _csi_alloc (ctx, sizeof (cairo_glyph_t) * nglyphs);
 	if (_csi_unlikely (glyphs == NULL)) {
diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c
index c08e447..22d1721 100644
--- a/util/cairo-script/cairo-script-scanner.c
+++ b/util/cairo-script/cairo-script-scanner.c
@@ -34,9 +34,10 @@
 
 #include "cairo-script-private.h"
 
+#include <limits.h> /* INT_MAX */
+#include <math.h> /* pow */
 #include <stdio.h> /* EOF */
 #include <string.h> /* memset */
-#include <math.h> /* pow */
 
 /*
  * whitespace:
@@ -88,7 +89,7 @@ _csi_buffer_grow (csi_t *ctx, csi_buffer_t *buffer)
     if (_csi_unlikely (buffer->status))
 	return buffer->status;
 
-    if (_csi_unlikely (buffer->size > INT32_MAX / 2))
+    if (_csi_unlikely (buffer->size > INT_MAX / 2))
 	return buffer->status = _csi_error (CSI_STATUS_NO_MEMORY);
 
     offset = buffer->ptr - buffer->base;
diff --git a/util/cairo-script/cairo-script-stack.c b/util/cairo-script/cairo-script-stack.c
index d6c123b..59d2c6a 100644
--- a/util/cairo-script/cairo-script-stack.c
+++ b/util/cairo-script/cairo-script-stack.c
@@ -34,6 +34,7 @@
 
 #include "cairo-script-private.h"
 
+#include <limits.h> /* INT_MAX */
 #include <string.h>
 
 csi_status_t
@@ -43,7 +44,7 @@ _csi_stack_init (csi_t *ctx, csi_stack_t *stack, csi_integer_t size)
 
     stack->len = 0;
     stack->size = size;
-    /* assert ((unsigned) size < INT32_MAX / sizeof (csi_object_t)); */
+    /* assert ((unsigned) size < INT_MAX / sizeof (csi_object_t)); */
     stack->objects = _csi_alloc (ctx, size * sizeof (csi_object_t));
     if (_csi_unlikely (stack->objects == NULL))
 	status = _csi_error (CSI_STATUS_NO_MEMORY);
@@ -90,7 +91,7 @@ _csi_stack_roll (csi_t *ctx,
 
     /* fall back to a copy */
     if (n > ARRAY_LENGTH (stack_copy)) {
-	if (_csi_unlikely ((unsigned) n > INT32_MAX / sizeof (csi_object_t)))
+	if (_csi_unlikely ((unsigned) n > INT_MAX / sizeof (csi_object_t)))
 	    return _csi_error (CSI_STATUS_NO_MEMORY);
 	copy = _csi_alloc (ctx, n * sizeof (csi_object_t));
 	if (copy == NULL)
@@ -124,7 +125,7 @@ _csi_stack_grow (csi_t *ctx, csi_stack_t *stack, csi_integer_t cnt)
 
     if (_csi_likely (cnt <= stack->size))
 	return CSI_STATUS_SUCCESS;
-    if (_csi_unlikely ((unsigned) cnt >= INT32_MAX / sizeof (csi_object_t)))
+    if (_csi_unlikely ((unsigned) cnt >= INT_MAX / sizeof (csi_object_t)))
 	return _csi_error (CSI_STATUS_NO_MEMORY);
 
     newsize = stack->size;
commit 3d3d10a31e04498ef91a288d89b3dec291bfc323
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:10:47 2009 +0100

    [skiplist] Missing include for ffs()

diff --git a/src/cairo-skiplist.c b/src/cairo-skiplist.c
index 5c2c477..776e7e7 100644
--- a/src/cairo-skiplist.c
+++ b/src/cairo-skiplist.c
@@ -25,6 +25,8 @@
 
 #include "cairo-skiplist-private.h"
 
+#include <strings.h> /* ffs() */
+
 #define ELT_DATA(elt) (void *)	((char*) (elt) - list->data_size)
 #define NEXT_TO_ELT(next)	(skip_elt_t *) ((char *) (next) - offsetof (skip_elt_t, next))
 
commit e5752865ab0ebefec313ab9a6f90451ef2d7af95
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:58:45 2009 +0100

    [cairo] Protect typeof against -ansi
    
    s/typeof/__typeof__/ to allow the [gcc-specific] macro to continue to work
    despite -ansi.

diff --git a/src/cairoint.h b/src/cairoint.h
index 0aa9ebf..29b8ea6 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -127,7 +127,7 @@ _cairo_win32_tmpfile (void);
 
 #ifdef __GNUC__
 #define cairo_container_of(ptr, type, member) ({ \
-    const typeof(((type *) 0)->member) *mptr__ = (ptr); \
+    const __typeof__ (((type *) 0)->member) *mptr__ = (ptr); \
     (type *) ((char *) mptr__ - offsetof (type, member)); \
 })
 #else
commit 5f4f2ab01ab3fa6b07ac7521dfeaf90a787a5dee
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:34:47 2009 +0100

    [cairo] Remove stray semi-colon
    
    Pedantic finds another victim.

diff --git a/src/cairoint.h b/src/cairoint.h
index b06126d..0aa9ebf 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -151,7 +151,7 @@ do {					\
     assert (NOT_REACHED);		\
 } while (0)
 #define COMPILE_TIME_ASSERT1(condition, line)		\
-    typedef int compile_time_assertion_at_line_##line##_failed [(condition)?1:-1];
+    typedef int compile_time_assertion_at_line_##line##_failed [(condition)?1:-1]
 #define COMPILE_TIME_ASSERT0(condition, line)	COMPILE_TIME_ASSERT1(condition, line)
 #define COMPILE_TIME_ASSERT(condition)		COMPILE_TIME_ASSERT0(condition, __LINE__)
 
commit d86ad461cf7a9d857bd07a6b775c84acbf35647b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 14:16:05 2009 +0100

    [cairo] Convert C99 comments to /* ... */
    
    First victim of -pedantic...

diff --git a/src/cairoint.h b/src/cairoint.h
index 29e7ccf..b06126d 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -85,7 +85,7 @@
 
 CAIRO_BEGIN_DECLS
 
-#if _WIN32 && !_WIN32_WCE // we don't have to worry about permissions on WinCE
+#if _WIN32 && !_WIN32_WCE /* Permissions on WinCE? No worries! */
 cairo_private FILE *
 _cairo_win32_tmpfile (void);
 #define tmpfile() _cairo_win32_tmpfile()
commit 695f648607dd5a78cf29dcc33ed19aa223d0416a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 11:16:10 2009 +0100

    [cairo] Fix errors reported by check-doc
    
    Identity a few new instances of CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED in
    comments with %.

diff --git a/src/cairo.h b/src/cairo.h
index a92c26c..b9c47db 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -1557,7 +1557,7 @@ typedef cairo_status_t (*cairo_user_scaled_font_render_glyph_func_t) (cairo_scal
  *
  * The callback is optional.  If @num_glyphs is negative upon
  * the callback returning or if the return value
- * isCAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, the unicode_to_glyph callback
+ * is %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, the unicode_to_glyph callback
  * is tried.  See #cairo_user_scaled_font_unicode_to_glyph_func_t.
  *
  * Note: While cairo does not impose any limitation on glyph indices,
@@ -1569,7 +1569,7 @@ typedef cairo_status_t (*cairo_user_scaled_font_render_glyph_func_t) (cairo_scal
  * glyph value for other purposes.
  *
  * Returns: %CAIRO_STATUS_SUCCESS upon success,
- * CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried,
+ * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried,
  * or %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error.
  *
  * Since: 1.8
@@ -1604,7 +1604,7 @@ typedef cairo_status_t (*cairo_user_scaled_font_text_to_glyphs_func_t) (cairo_sc
  *
  * The callback is optional, and only used if text_to_glyphs callback is not
  * set or fails to return glyphs.  If this callback is not set or if it returns
- * CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, an identity mapping from Unicode
+ * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED, an identity mapping from Unicode
  * code-points to glyph indices is assumed.
  *
  * Note: While cairo does not impose any limitation on glyph indices,
@@ -1616,7 +1616,7 @@ typedef cairo_status_t (*cairo_user_scaled_font_text_to_glyphs_func_t) (cairo_sc
  * glyph value for other purposes.
  *
  * Returns: %CAIRO_STATUS_SUCCESS upon success,
- * CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried,
+ * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried,
  * or %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error.
  *
  * Since: 1.8
commit 849bdee199b5ebba467603a69d30bb519c10bc75
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 11:36:38 2009 +0100

    [check] Quieten output during checking headers-standalone
    
    Remove the duplication of the compile line and enable shave to replace it
    entirely with a "CHECK $header". This should make errors more obvious.

diff --git a/build/shave.in b/build/shave.in
index 5c16f27..cedccd4 100644
--- a/build/shave.in
+++ b/build/shave.in
@@ -69,6 +69,9 @@ lt_unmangle "$lt_output"
 output=$last_result
 
 if test -z $V; then
+    if test $output = "/dev/null"; then
+	pass_through=1
+    fi
     if test $pass_through -eq 0; then
         echo "$Q$output"
     fi
diff --git a/src/Makefile.am.analysis b/src/Makefile.am.analysis
index 4d527bf..ea9caec 100644
--- a/src/Makefile.am.analysis
+++ b/src/Makefile.am.analysis
@@ -23,7 +23,7 @@ uno:
 headers-standalone: $(enabled_cairo_headers) $(enabled_cairo_private)
 	@echo Checking that enabled public/private headers can be compiled standalone
 	@status=true; for f in $(enabled_cairo_headers) $(enabled_cairo_private); do \
-		echo $(COMPILE) -o /dev/null $(srcdir)/$$f; \
+		echo "  CHECK $$f"; \
 		$(COMPILE) -o /dev/null $(srcdir)/$$f || status=false; \
 	done; $$status
 	@touch $@
commit 84fad4b11bc26cfd0847660e3309eb902d783713
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 11:31:22 2009 +0100

    [build] Fix gtk-doc interoperation with shave
    
    Add --tag=CC to the libtool invocations.

diff --git a/build/Makefile.am.gtk-doc b/build/Makefile.am.gtk-doc
index cb81599..50cd627 100644
--- a/build/Makefile.am.gtk-doc
+++ b/build/Makefile.am.gtk-doc
@@ -10,8 +10,8 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
commit fd72c56af833a738ddc8f188cabe03d9f8b45475
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 7 11:27:43 2009 +0100

    [build] Report status of gtk-doc in summary

diff --git a/build/configure.ac.features b/build/configure.ac.features
index 2d5fb8a..8ccee7b 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -387,6 +387,7 @@ AC_DEFUN([CAIRO_REPORT],
 	echo "  PNG functions: $use_png"
 	echo ""
 	echo "And the following internal features:"
+	echo "  gtk-doc:       $enable_gtk_doc"
 	echo "  gcov support:  $use_gcov"
 	echo "  test surfaces: $use_test_surfaces"
 	echo "  ps testing:    $test_ps"


More information about the cairo-commit mailing list