--- configure.orig	2015-09-04 11:35:11.223593000 +0200
+++ configure	2015-09-04 11:35:40.650664000 +0200
@@ -21453,14 +21453,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	    libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	    libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	    libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_CFLAGS=`$PKG_CONFIG --cflags "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21473,14 +21473,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	    libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	    libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	    libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_LIBS=`$PKG_CONFIG --libs "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21502,10 +21502,10 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         else
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EPUB_PKG_ERRORS" >&5
@@ -21534,14 +21534,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	    libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	    libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	    libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21554,14 +21554,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	    libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	    libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	    libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_LIBS=`$PKG_CONFIG --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21583,10 +21583,10 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         else
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	    libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	    libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EPUB_PKG_ERRORS" >&5
@@ -21617,14 +21617,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	       libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	       libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	       libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	       libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21637,14 +21637,14 @@
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-\$WEBKIT_API_VERSION >= \$WEBKIT_REQUIRED \\
-	       libxml-2.0 >= \$LIBXML_REQUIRED zlib\""; } >&5
+	       libxml-2.0 >= \$LIBXML_REQUIRED \""; } >&5
   ($PKG_CONFIG --exists --print-errors "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib") 2>&5
+	       libxml-2.0 >= $LIBXML_REQUIRED ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EPUB_LIBS=`$PKG_CONFIG --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>/dev/null`
+	       libxml-2.0 >= $LIBXML_REQUIRED " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -21666,10 +21666,10 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	       libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         else
 	        EPUB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
-	       libxml-2.0 >= $LIBXML_REQUIRED zlib" 2>&1`
+	       libxml-2.0 >= $LIBXML_REQUIRED " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EPUB_PKG_ERRORS" >&5