[grisbi-cvs] [SCM] grisbi branch, master, updated. de0d4cf961e4e4fd4475b8da51559fb500382a69

[Rémi Cardona]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  de0d4cf961e4e4fd4475b8da51559fb500382a69 (commit)
      from  23961f592cf85d269884532b3f2496e383e16887 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de0d4cf961e4e4fd4475b8da51559fb500382a69
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Jun 22 09:02:44 2010 +0200

    build: work around broken zlib package in Mandriva
    
    Mandriva apparently doesn't ship zlib.pc. For now, we'll put this hack in
    but it should be removed as soon as possible.

-----------------------------------------------------------------------

Changes:
diff --git a/configure.in b/configure.in
index 0684662..86aaf5b 100644
--- a/configure.in
+++ b/configure.in
@@ -25,8 +25,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.])
 dnl
 dnl Main Grisbi libraries
 dnl
-PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2 zlib])
-
+#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2 zlib])
+# Temporary hack until Mandriva ships zlib.pc
+PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2])
+GRISBI_LIBS="$GRISBI_LIBS -lz"
+AC_SUBST(GRISBI_LIBS)
+# </hack>
 
 dnl
 dnl balance estimate


hooks/post-receive
-- 
grisbi