[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-149-g0202afb

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit 1a4864bbeaf4b43782497ecc833d2e6adbae01cc
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Thu Jan 24 22:08:51 2013 +0100

    fixing detection of libm4ri's png

diff --git a/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch b/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch
new file mode 100644
index 0000000..c7bcede
--- /dev/null
+++ b/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch
@@ -0,0 +1,26 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Thu, 24 Jan 2013 22:01:54 +0100
+Subject: Correctly detecting libm4ri's png support
+
+---
+ SConstruct |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 86db408..40534db 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -936,7 +936,11 @@ if not env.GetOption('clean'):
+         libm4ri = ['m4ri']
+         if conf.CheckFunc('testing_m4ri_PNGs', """
+         #include <m4ri/io.h>
+-        #define testing_m4ri_PNGs() mzd_to_png(NULL,"",0,"",0)"""):
++        #if defined(__M4RI_HAVE_LIBPNG) && __M4RI_HAVE_LIBPNG
++        #define testing_m4ri_PNGs() 
++        #else
++        #define testing_m4ri_PNGs() fail fail fail
++        #endif """):
+             m4ri_png = True
+            
+     else:
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2e9fefc..ebb03a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-target-only-if-they-can-be-build.patch
+0002-Correctly-detecting-libm4ri-s-png-support.patch

-- 
polybori: Polynomials over Boolean Rings