talons

commit 05885d9df3ebe43c65ccaa6bcd5fdb5daf204ccf
parent 1114a38f3890f45e48285f35695ade33e30c3c82
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Thu,  4 Jun 2015 18:33:11 +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.

Diffstat:
M
configure.ac
 | 
13
++++++++++++-

1 file changed, 12 insertions(+), 1 deletion(-)
diff --git 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)