[cairo-commit] cairo ChangeLog, 1.808, 1.809 configure.in, 1.117, 1.118

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv21598

Modified Files:
	ChangeLog configure.in 
Log Message:

2005-08-03  Carl Worth  <cworth at cworth.org>

        Fix for bug #3951:

        * configure.in: Add new _CHECK_FUNCS_WITH_FLAGS to abstract out
        the pain of temporarily setting flags for AC_CHECK_FUNCS. Use this
        to check for the existence of FcFini.

        * test/cairo-test.c: (cairo_test_expecting): Make call to FcFini
        conditional on HAVE_FCFINI.

        * test/text-cache-crash.c: (main): Remove stale comment about
        cleaning up memory which is now handled by cairo-test.c.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -d -r1.808 -r1.809
--- ChangeLog	1 Aug 2005 21:39:01 -0000	1.808
+++ ChangeLog	3 Aug 2005 17:32:50 -0000	1.809
@@ -1,3 +1,17 @@
+2005-08-03  Carl Worth  <cworth at cworth.org>
+
+	Fix for bug #3951:
+
+	* configure.in: Add new _CHECK_FUNCS_WITH_FLAGS to abstract out
+	the pain of temporarily setting flags for AC_CHECK_FUNCS. Use this
+	to check for the existence of FcFini.
+	
+	* test/cairo-test.c: (cairo_test_expecting): Make call to FcFini
+	conditional on HAVE_FCFINI.
+	
+	* test/text-cache-crash.c: (main): Remove stale comment about
+	cleaning up memory which is now handled by cairo-test.c.
+
 2005-08-01  Owen Taylor  <otaylor at redhat.com>
 
 	reviewed by: cworth

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- configure.in	1 Aug 2005 20:33:47 -0000	1.117
+++ configure.in	3 Aug 2005 17:32:50 -0000	1.118
@@ -37,6 +37,27 @@
 AC_STDC_HEADERS
 AC_C_BIGENDIAN
 
+dnl ===========================================================================
+dnl === Local macros
+dnl ===========================================================================
+
+# _CHECK_FUNCS_WITH_FLAGS(FUNCTION..., CFLAGS, LIBS 
+#                         [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+# Like AC_CHECK_FUNCS but with additional CFLAGS and LIBS
+# --------------------------------------------------------------------
+AC_DEFUN([_CHECK_FUNCS_WITH_FLAGS],
+[ 
+  save_cflags="$CFLAGS"
+  save_libs="$LIBS"
+  CFLAGS="$CFLAGS $2"
+  LIBS="$LIBS $3"
+  AC_CHECK_FUNCS($1, $4, $5)
+  CFLAGS="$save_cflags"
+  LIBS="$save_libs"
+])
+
+dnl ===========================================================================
+
 AC_CHECK_FUNCS(vasnprintf)
 	
 AC_CHECK_LIBM
@@ -61,13 +82,7 @@
       XRENDER_LIBS="$X_LIBS -lXrender -lXext -lX11 $X_EXTRA_LIBS"
       use_xlib=yes], [
 		use_xlib="no (requires Xrender http://freedesktop.org/Software/xlibs)"])])
-  save_cflags="$CFLAGS"
-  save_libs="$LIBS"
-  CFLAGS="$CFLAGS $XRENDER_CFLAGS"
-  LIBS="$LIBS $XRENDER_LIBS"
-  AC_CHECK_FUNCS(XrmFinalize)
-  CFLAGS="$save_cflags"
-  LIBS="$save_libs"
+  _CHECK_FUNCS_WITH_FLAGS(XrmFinalize, $XRENDER_CFLAGS, $XRENDER_LIBS)
 fi
 
 AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, test "x$use_xlib" = "xyes")
@@ -232,6 +247,7 @@
 if test "x$use_freetype" = "xyes"; then
   PKG_CHECK_MODULES(FONTCONFIG, fontconfig, 
                     [use_freetype=yes], [use_freetype=no])
+  _CHECK_FUNCS_WITH_FLAGS(FcFini, $FONTCONFIG_CFLAGS, $FONTCONFIG_LIBS)
 fi
 
 CAIRO_CFLAGS="$CAIRO_CFLAGS $FONTCONFIG_CFLAGS"