Patch patch1 for haru Bug #62098

Patch version 2012-05-21 17:55 UTC

• 2012-05-21 17:55 UTC [diff to current]

Developer: tomkrawc@gmail.com

--- config-orig.w32	2012-02-02 12:21:40.000000000 +0100
+++ config.w32	2012-05-21 18:55:51.328125000 +0200
@@ -3,13 +3,17 @@
 
 ARG_WITH("haru", "Haru PDF support", "no");
 
-if (PHP_HARU == "yes") {
+if (PHP_HARU != "no") {
 	if (CHECK_LIB("libhpdf.lib", "haru") &&
-			CHECK_LIB("libpng.lib", "haru") &&
-			CHECK_LIB("zlib.lib", "haru") &&
-			CHECK_HEADER_ADD_INCLUDE("hpdf.h", "CFLAGS_HARU", PHP_HARU + ";" + PHP_PHP_BUILD + "\\include\\libharu")) {
+			CHECK_LIB("libpng_a.lib", "haru") &&
+			CHECK_LIB("zlib_a.lib", "haru") &&
+			CHECK_HEADER_ADD_INCLUDE("hpdf.h", "CFLAGS_HARU", PHP_HARU + ";" + PHP_PHP_BUILD + "\\include\\libharu")
+		) {
 
 		EXTENSION("haru", "haru.c");
+		AC_DEFINE('HAVE_HARU', 1, "Have haru support");
+	}
+	else {
+		WARNING("haru not enabled; libraries and headers not found");
 	}
 }
-