[cairo-commit] 2 commits - acinclude.m4 configure.ac

[M. Joonas Pihlaja]

 acinclude.m4 |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d544828934e479071fe5246fc0bdbbad33c097e8
Author: M Joonas Pihlaja <rowan at sal.math.ualberta.ca>
Date:   Sat Jun 20 06:16:51 2009 -0600

    [build] Look for libpng.pc as well when configuring.
    
    The OpenBSD png package installs only libpng.pc and not
    any of libpng{13,12,10}.pc.

diff --git a/configure.ac b/configure.ac
index e389f24..06b7fa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
   if test "x$png_REQUIRES" = x; then
     # libpng13 is GnuWin32's libpng-1.2.8 :-(
-    for l in libpng12 libpng13 libpng10 ; do
+    for l in libpng12 libpng13 libpng10 libpng; do
       if $PKG_CONFIG --exists $l ; then
         png_REQUIRES=$l
         use_png=yes
commit 5733d8d6c35e1a77513a49267a47f6caae68e829
Author: M Joonas Pihlaja <rowan at sal.math.ualberta.ca>
Date:   Sat Jun 20 06:11:44 2009 -0600

    [build] Remove a level of quoting from CAIRO_PARSE_VERSION.
    
    The m4 that comes with OpenBSD gets confused by the extra quoting
    applied to the version number argument when building the
    bodies of the cairo_version_{major,minor,micro} macros using
    m4_bpatsubst(). Since we're making sure that the argument is always
    a number, we can safely use the unquoted \2 body rather than \[\2\].

diff --git a/acinclude.m4 b/acinclude.m4
index c45b4d2..dcf54f9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,7 +38,7 @@ 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\])]]),
+			     [[m4_define(\1, \2)]]),
 			    [A-Z], [a-z])dnl
 )dnl