From 8b00a61e8b2f6dbbe7e19a40959fada69469106c Mon Sep 17 00:00:00 2001 From: Dave Beckett Date: Fri, 12 Dec 2003 16:00:19 +0000 Subject: [PATCH] Add compatibility defines FONTCONFIG_LIBS, X_LIBS, XRENDER_LIBS to keep automake happy - they look like automake variable names. --- ChangeLog | 6 ++++++ src/Makefile.am | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 85664e05d..4c17ddb9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-12-12 Dave Beckett + + * src/Makefile.am: Add compatibility defines FONTCONFIG_LIBS, + X_LIBS, XRENDER_LIBS to keep automake happy - they look like + automake variable names. + 2003-12-12 Carl Worth * src/cairo_font.c (_cairo_font_create): Add comment about diff --git a/src/Makefile.am b/src/Makefile.am index 5dd831f9d..606b4f837 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,14 @@ if CAIRO_HAS_XLIB_SURFACE libcairo_xlib_sources = cairo_xlib_surface.c endif +# These names match automake style variable definition conventions so +# without these lines, automake will complain during the handling of +# the libcairo_la_LIBADD below. (The INCLUDES is an autoconf only +# term and automake does not care about it) +FONTCONFIG_LIBS=@FONTCONFIG_LIBS@ +X_LIBS=@X_LIBS@ +XRENDER_LIBS=@XRENDER_LIBS@ + libcairo_la_SOURCES = \ cairo.c \ cairo.h \