diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cairomm/Makefile.am | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2008-03-10 Jonathon Jongsma <jjongsma@gnome.org> + * cairomm/Makefile.am: install the new cairommconfig.h header and make sure + that the .in file is distributed + +2008-03-10 Jonathon Jongsma <jjongsma@gnome.org> + * cairomm/exception.cc: include <string> to fix the build on solaris which apparently doesn't include string from their exception header (Tim Mooney). Fixes bug #14559 diff --git a/cairomm/Makefile.am b/cairomm/Makefile.am index d4de9bd..ad2b535 100644 --- a/cairomm/Makefile.am +++ b/cairomm/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ -h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h +h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h cairommconfig.h h_sources_private = private.h cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc cc_sources_private = private.cc @@ -22,3 +22,5 @@ libcairomm_1_0_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_privat # Install the headers: library_includedir=$(includedir)/cairomm-1.0/cairomm library_include_HEADERS = $(h_sources_public) + +EXTRA_DIST = cairommconfig.h.in |