[cairo-commit] 2 commits - build/configure.ac.enable build/configure.ac.version

[Behdad Esfahbod]

 build/configure.ac.enable  |    8 +++++++-
 build/configure.ac.version |   12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit eb092eadbb3439b579866564eee003683f2abc5c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 21:45:25 2008 -0400

    [configure] Add non-pkgconfig cflags/libs before substitution

diff --git a/build/configure.ac.enable b/build/configure.ac.enable
index e04b9f0..1e757fb 100644
--- a/build/configure.ac.enable
+++ b/build/configure.ac.enable
@@ -187,12 +187,18 @@ CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([REQUIRES],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([CFLAGS NONPKGCONFIG_CFLAGS],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([LIBS NONPKGCONFIG_LIBS],,[ ],[$LIBS])dnl
 AC_SUBST(CAIRO_REQUIRES)dnl
-AC_SUBST(CAIRO_BASE)dnl
 AC_SUBST(CAIRO_CFLAGS)dnl
 AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)dnl
 AC_SUBST(CAIRO_LIBS)dnl
 AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)dnl
 
+dnl add non-pkgconfig values
+AC_CONFIG_COMMANDS_PRE(
+[dnl
+CAIRO_CFLAGS="$CAIRO_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $CAIRO_NONPKGCONFIG_LIBS"
+])dnl
+
 m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE],
 [dnl
 	AC_CONFIG_FILES([$3:$4],
commit 09d7eb6c35da2819d9e254d8b7675eb39aa965c3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 19:54:35 2008 -0400

    [configure.ac.version] Quote m4_define arguments

diff --git a/build/configure.ac.version b/build/configure.ac.version
index 0d8805c..7d5dc09 100644
--- a/build/configure.ac.version
+++ b/build/configure.ac.version
@@ -9,23 +9,23 @@ m4_define([cairo_release_status],
 		                                               [release])])])
 
 dnl This is the .so/dll number.  2 for cairo-1.x.x
-m4_define(cairo_version_sonum, m4_eval(cairo_version_major + 1))
+m4_define([cairo_version_sonum], m4_eval(cairo_version_major + 1))
 
 dnl The libtool shared library version stuff
-m4_define(cairo_version,
+m4_define([cairo_version],
 	  m4_eval(cairo_version_major*10000 + cairo_version_minor*100 + cairo_version_micro))
 m4_if(m4_eval(cairo_version_minor % 2), [1],
       [
 	dnl for unstable releases
-	m4_define(cairo_libtool_revision, 0)
+	m4_define([cairo_libtool_revision], 0)
       ],
       [
 	dnl for stable releases
-	m4_define(cairo_libtool_revision, cairo_version_micro)
+	m4_define([cairo_libtool_revision], cairo_version_micro)
       ])
-m4_define(cairo_libtool_current,
+m4_define([cairo_libtool_current],
 	  m4_eval(cairo_version_sonum + cairo_version - cairo_libtool_revision))
-m4_define(cairo_libtool_age,
+m4_define([cairo_libtool_age],
 	  m4_eval(cairo_libtool_current - cairo_version_sonum))
 
 CAIRO_VERSION_MAJOR=cairo_version_major