[cairo-commit] 3 commits - acinclude.m4 build/aclocal.cairo.m4 build/aclocal.enable.m4 build/configure.ac.enable

[Behdad Esfahbod]

 acinclude.m4              |   13 +++++++++++++
 build/aclocal.cairo.m4    |   11 -----------
 build/aclocal.enable.m4   |    6 +++---
 build/configure.ac.enable |    5 +++--
 4 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit fb0bf165950cf85add6c187e5ec432f8c07b2cc2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 19:21:03 2008 -0400

    [aclocal] Don't use m4_defn
    
    Apparently autoconf 2.59 on msys is not quite happy it

diff --git a/build/aclocal.enable.m4 b/build/aclocal.enable.m4
index 0751988..31432a4 100644
--- a/build/aclocal.enable.m4
+++ b/build/aclocal.enable.m4
@@ -204,7 +204,7 @@ dnl Defines VAR to the variable being processed.
 dnl
 AC_DEFUN([CAIRO_FEATURE_VARS_FOREACH],
 [dnl
-	m4_foreach_w([$1], m4_defn([_CAIRO_FEATURE_VARS]), [$2])dnl
+	m4_foreach_w([$1], _CAIRO_FEATURE_VARS, [$2])dnl
 ])
 
 
@@ -316,7 +316,7 @@ dnl Defines VAR to the accumulator being processed.
 dnl
 AC_DEFUN([CAIRO_ACCUMULATORS_FOREACH],
 [dnl
-	m4_foreach_w([$1], m4_defn([_CAIRO_ACCUMULATORS]), [$2])dnl
+	m4_foreach_w([$1], _CAIRO_ACCUMULATORS, [$2])dnl
 ])dnl
 
 
@@ -347,7 +347,7 @@ dnl Defines VAR to the variable being processed.
 dnl
 AC_DEFUN([CAIRO_ACCUMULATED_FEATURE_VARS_FOREACH],
 [dnl
-	m4_foreach_w([$1], m4_defn([_CAIRO_ACCUMULATED_FEATURE_VARS]), [$2])dnl
+	m4_foreach_w([$1], _CAIRO_ACCUMULATED_FEATURE_VARS, [$2])dnl
 ])dnl
 
 dnl ===========================================================================
commit 879b5c705726ce6d1a5035cfef41aba06b0cb4dc
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 19:18:06 2008 -0400

    [aclocal] Move CAIRO_PARSE_VERSION to acinclude.m4
    
    It belongs there as it includes other files.  It was breaking build
    on older autoconf it seems.

diff --git a/acinclude.m4 b/acinclude.m4
index d065e8e..fdafe0b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,3 +4,16 @@ dnl [m4_newline] didn't appear until autoconf 2.62
 m4_ifdef([m4_newline],,m4_define([m4_newline],[
 ]))
 
+dnl ==========================================================================
+
+dnl This has to be in acinclude.m4 as it includes other files
+
+dnl Parse Version.mk and declare m4 variables out of it
+m4_define([CAIRO_PARSE_VERSION],dnl
+		m4_translit(dnl
+		m4_bpatsubst(m4_include(cairo-version.h),
+			     [^.define \([a-zA-Z0-9_]*\)  *\([0-9][0-9]*\)],
+			     [[m4_define(\1, \[\2\])]]),
+			    [A-Z], [a-z])dnl
+)dnl
+
diff --git a/build/aclocal.cairo.m4 b/build/aclocal.cairo.m4
index 8229f93..79c2ff8 100644
--- a/build/aclocal.cairo.m4
+++ b/build/aclocal.cairo.m4
@@ -8,17 +8,6 @@ m4_pattern_forbid([^cr_])
 
 dnl ==========================================================================
 
-dnl Parse Version.mk and declare m4 variables out of it
-m4_define([CAIRO_PARSE_VERSION],dnl
-		m4_translit(dnl
-		m4_bpatsubst(m4_include(cairo-version.h),
-			     [^.define \([a-zA-Z0-9_]*\)  *\([0-9][0-9]*\)],
-			     [[m4_define(\1, \[\2\])]]),
-			    [A-Z], [a-z])dnl
-)dnl
-
-dnl ==========================================================================
-
 dnl Usage:
 dnl   CAIRO_BIGENDIAN
 dnl
commit 656b0e3ea7117ceb28080e1c8605254bbec92a75
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 19:17:27 2008 -0400

    [configure.ac] Avoid sed -i (#17563)

diff --git a/build/configure.ac.enable b/build/configure.ac.enable
index 88bb7ec..e04b9f0 100644
--- a/build/configure.ac.enable
+++ b/build/configure.ac.enable
@@ -197,14 +197,15 @@ m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE],
 [dnl
 	AC_CONFIG_FILES([$3:$4],
 	[dnl
-		$SED -i -e "dnl
+		mv "$3" "$3.tmp" &&
+		$SED "dnl
 		s%@FEATURE_PC@%]cr_pc_modname([$1])[%g;dnl
 		s%@FEATURE_NAME@%$2%g;dnl
 		s%@FEATURE_BASE@%$$1_BASE%g;dnl
 		s%@FEATURE_REQUIRES@%$$1_REQUIRES%g;dnl
 		s%@FEATURE_NONPKGCONFIG_LIBS@%$$1_NONPKGCONFIG_LIBS%g;dnl
 		s%@FEATURE_NONPKGCONFIG_CFLAGS@%$$1_NONPKGCONFIG_CFLAGS%g;dnl
-		" "$3" ||
+		" < "$3.tmp" > "$3" && rm -f "$3.tmp" ||
 		AC_MSG_ERROR(failed to update $3)
 	],[dnl
 		SED='$SED'