[Commits] [SCM] claws branch, master, updated. 3.11.1-115-g05885d9

[ticho at claws-mail.org]

The branch, master has been updated
       via  05885d9df3ebe43c65ccaa6bcd5fdb5daf204ccf (commit)
      from  1114a38f3890f45e48285f35695ade33e30c3c82 (commit)

Summary of changes:
 configure.ac |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 05885d9df3ebe43c65ccaa6bcd5fdb5daf204ccf
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Jun 4 18:33:11 2015 +0200

    Re-add old method for Expat library detection during configure.
    
    Pkg-config can only find expat from 2.1.0 onwards, but earlier
    expat did not install a .pc file for it, so we need to also
    check outside of pkg-config.

diff --git a/configure.ac b/configure.ac
index c4df03d..a14af50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,8 +1070,19 @@ AC_SUBST(CURL_CFLAGS)
 
 dnl expat **********************************************************************
 PKG_CHECK_MODULES(EXPAT, expat, HAVE_EXPAT=yes, HAVE_EXPAT=no)
-AC_SUBST(EXPAT_LIBS)
+
+if test x"$HAVE_EXPAT" = xno; then
+	AC_CHECK_HEADER(expat.h, [expat_header=yes], [expat_header=no])
+	AC_CHECK_LIB(expat, XML_ParserCreate, [expat_lib=yes], [expat_lib=no])
+	if test x"$expat_header" = xyes -a x"$expat_lib"=xyes; then
+		HAVE_EXPAT=yes
+		EXPAT_CFLAGS=""
+		EXPAT_LIBS="-lexpat"
+	fi
+fi
+
 AC_SUBST(EXPAT_CFLAGS)
+AC_SUBST(EXPAT_LIBS)
 
 dnl webkit *********************************************************************
 PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.1.14, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)

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


hooks/post-receive
-- 
Claws Mail