[cairo-commit] Branch '1.6' - 2 commits - boilerplate/Makefile.am configure.in src/Makefile.am

[Chris Wilson]

 boilerplate/Makefile.am |    5 +++--
 configure.in            |   15 +++++++--------
 src/Makefile.am         |    5 +++--
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit e30a50746d1c14e3d23d52988a8e98f22cb3cd0b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 5 15:18:48 2008 +0000

    [Makefile] Hide cpp files from automake
    
    Prevent automake from including a CPP file with the SOURCE as that breaks
    linking.

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index fdf46fa..8880b4b 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -13,8 +13,9 @@ libcairoboilerplate_la_SOURCES =	\
 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
 
 if CAIRO_HAS_BEOS_SURFACE
-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
+# comment out the cpp files otherwise automake thinks we need g++
+#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
+#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
 # BeOS system headers trigger this warning
 libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
 endif
diff --git a/configure.in b/configure.in
index f67fc5c..28e9c28 100644
--- a/configure.in
+++ b/configure.in
@@ -444,9 +444,8 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, beos, BEOS_SURFACE, no, [
   esac
 ])
 
-if test "x$use_beos" = "xyes"; then
-  AC_PROG_CXX
-fi
+dnl We need g++ to compile the Beos backend
+AC_PROG_CXX
 
 dnl ===========================================================================
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e56485c..3cea0b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -230,8 +230,9 @@ cairo_sources += $(os2_sources)
 backend_pkgconfigs += cairo-os2.pc
 endif
 
-beos_headers = cairo-beos.h
-beos_sources = cairo-beos-surface.cpp
+# comment out the cpp files otherwise automake thinks we need g++
+#beos_headers = cairo-beos.h
+#beos_sources = cairo-beos-surface.cpp
 cairo_all_sources += $(beos_headers) $(beos_sources)
 if CAIRO_HAS_BEOS_SURFACE
 cairo_headers += $(beos_headers)
commit e13586b6b78d3636c3e00b437fdb4f3ac449b185
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 5 15:06:10 2008 +0000

    [configure] Fixup breakage with recent autoconf
    
    To avoid these warnings:
    configure.in:29: error: possibly undefined macro: LT_CURRENT
          If this token and others are legitimate, please use
    m4_pattern_allow.
          See the Autoconf documentation.
    configure.in:33: error: possibly undefined macro: LT_REVISION
    configure.in:38: error: possibly undefined macro: LT_AGE
    
    we simply use an m4_define for those variables instead.

diff --git a/configure.in b/configure.in
index 6aa1052..f67fc5c 100644
--- a/configure.in
+++ b/configure.in
@@ -26,23 +26,23 @@ dnl ===========================================================================
 # libtool shared library version
 
 # Increment if the interface has additions, changes, removals.
-LT_CURRENT=19
+m4_define(LT_CURRENT, 19)
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
-LT_REVISION=5
+m4_define(LT_REVISION, 5)
 
 # Increment if any interfaces have been added; set to 0
 # if any interfaces have been removed. removal has
 # precedence over adding, so set to 0 if both happened.
-LT_AGE=17
+m4_define(LT_AGE, 17)
 
 dnl ===========================================================================
 
-VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
 AC_SUBST(VERSION_INFO)
 
-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+LT_CURRENT_MINUS_AGE=m4_eval(LT_CURRENT() - LT_AGE())
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
 CAIRO_VERSION_MAJOR=cairo_version_major()