diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-15 19:18:06 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-15 19:18:06 -0400 |
commit | 879b5c705726ce6d1a5035cfef41aba06b0cb4dc (patch) | |
tree | 77cbd321f718eac1ae0c57c219421b042ee3a08b | |
parent | 656b0e3ea7117ceb28080e1c8605254bbec92a75 (diff) |
[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.
-rw-r--r-- | acinclude.m4 | 13 | ||||
-rw-r--r-- | build/aclocal.cairo.m4 | 11 |
2 files changed, 13 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d065e8ef..fdafe0ba 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 8229f934..79c2ff8d 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 |