1 Libtool 2.2.2 can't cope unless the LT_ variables are marked as AC_SUBST
2 as otherwise autofoo tries to expand them, fails and gets upset.
4 You can't conditionally add AC_PROG_CXX to a configure.ac file since the
5 mere mention of it triggers some internals which then get upset it if
6 wasn't really called at configure time.
8 Referring to a .cpp file in Makefiles without calling AC_PROG_CXX is
9 now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
14 boilerplate/Makefile.am | 1 -
15 configure.in | 6 +++---
16 2 files changed, 3 insertions(+), 4 deletions(-)
18 --- cairo-1.6.4.orig/boilerplate/Makefile.am
19 +++ cairo-1.6.4/boilerplate/Makefile.am
20 @@ -11,11 +11,10 @@ libcairoboilerplate_la_SOURCES = \
23 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
25 if CAIRO_HAS_BEOS_SURFACE
26 -libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
27 libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
28 # BeOS system headers trigger this warning
29 libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
32 --- cairo-1.6.4.orig/configure.in
33 +++ cairo-1.6.4/configure.in
34 @@ -25,19 +25,22 @@ dnl ====================================
36 # libtool shared library version
38 # Increment if the interface has additions, changes, removals.
42 # Increment any time the source changes; set to
43 # 0 if you increment CURRENT
45 +AC_SUBST(LT_REVISION)
47 # Increment if any interfaces have been added; set to 0
48 # if any interfaces have been removed. removal has
49 # precedence over adding, so set to 0 if both happened.
53 dnl ===========================================================================
55 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
56 AC_SUBST(VERSION_INFO)
57 @@ -442,13 +445,10 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, be
58 use_beos="no (requires a BeOS platform)"
63 -if test "x$use_beos" = "xyes"; then
67 dnl ===========================================================================
69 CAIRO_BACKEND_ENABLE(png, PNG, png, PNG_FUNCTIONS, yes, [