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

[Behdad Esfahbod]

 acinclude.m4              |    4 ++++
 build/configure.ac.enable |   12 ++++++------
 configure.ac              |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit cdee34c5b77b7d6b16bd0b8d22e25211064dbc23
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Sep 7 16:53:14 2008 -0400

    Back to using autoconf 2.58

diff --git a/acinclude.m4 b/acinclude.m4
index 7d95ade..806e88b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -260,3 +260,7 @@ m4_define([CAIRO_PARSE_VERSION],
 			     [[m4_define(\1, \[\2\])]]),
 			    [A-Z], [a-z])
 )
+
+dnl [m4_newline] didn't appear until autoconf 2.62
+m4_ifdef([m4_newline],,m4_define([m4_newline],[
+]))
diff --git a/build/configure.ac.enable b/build/configure.ac.enable
index 6e681b2..52d37bc 100644
--- a/build/configure.ac.enable
+++ b/build/configure.ac.enable
@@ -42,9 +42,9 @@ AC_DEFUN([_CAIRO_ENABLE],
 		[m4_fatal([invalid feature name `$1'])]
 	)
 	m4_define([cr_feature], [$1])
-	m4_define([cr_feature_name], m4_normalize(m4_expand([$2])))
-	m4_define([cr_feature_what], m4_normalize(m4_expand([$3])))
-	m4_define([cr_feature_default], m4_normalize(m4_expand([$4])))
+	m4_define([cr_feature_name], m4_normalize([$2]))
+	m4_define([cr_feature_what], m4_normalize([$3]))
+	m4_define([cr_feature_default], m4_normalize([$4]))
 	m4_define([cr_feature_commands], [$5])
 	m4_define([cr_feature_commands_len], m4_len([$5]))
 
@@ -170,7 +170,7 @@ AC_DEFUN([CAIRO_FEATURE_VARS_REGISTER],
 
 AC_DEFUN([CAIRO_FEATURE_VARS_FOREACH],
 [
-	m4_foreach_w([$1], m4_expand(CAIRO_FEATURE_VARS), [$2])
+	m4_foreach_w([$1], m4_quote(CAIRO_FEATURE_VARS), [$2])
 ])
 
 
@@ -234,8 +234,8 @@ AC_DEFUN([CAIRO_FEATURE_HOOK_REGISTER],
 [
 	m4_append([_CAIRO_FEATURE_HOOKS],
 	[
-		_CAIRO_FEATURE_HOOK_MATCH(m4_expand([$1]), cr_feature_default,
-		[_CAIRO_FEATURE_HOOK_MATCH(m4_expand([$2]), cr_feature_what,
+		_CAIRO_FEATURE_HOOK_MATCH([$1], cr_feature_default,
+		[_CAIRO_FEATURE_HOOK_MATCH([$2], cr_feature_what,
 		 [$3]
 		)])
 	], m4_newline)
diff --git a/configure.ac b/configure.ac
index 26bd293..b159293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.62)
+AC_PREREQ(2.58)
 CAIRO_PARSE_VERSION
 AC_INIT([cairo],
 	[cairo_version_major.cairo_version_minor.cairo_version_micro],