# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1460735875 -3600
# Node ID 45e2bb06c88d411b88f15451c4c8e6d6892d797d
# Parent  4b7270fd32012c7971baf0232320a2be0e83b214
Support expat v2.1

diff -r 4b7270fd3201 -r 45e2bb06c88d configure.ac
--- a/configure.ac	Thu Apr 14 11:59:56 2016 +0100
+++ b/configure.ac	Fri Apr 15 16:57:55 2016 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59c)
-AC_INIT([razor], [0.6.1], [ali@juiblex.co.uk])
+AC_INIT([razor], [0.6.2], [ali@juiblex.co.uk])
 AM_INIT_AUTOMAKE([])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
@@ -235,19 +235,23 @@
 AC_SUBST(ZLIB_LIBS)
 
 EXPAT_LIB=""
-AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
-                      [
-                      expat=$withval
-                      CPPFLAGS="$CPPFLAGS -I$withval/include"
-                      ]
-                      )
-AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
+PKG_CHECK_MODULES(EXPAT, [expat21],
+  [AC_DEFINE([HAVE_EXPAT_H])
+   CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"],
+  [AC_ARG_WITH(expat, [  --with-expat=<dir>      If expat 2.1 isn't available,
+                          fallback to using legacy expat from here],
+                        [
+                        expat=$withval
+                        CPPFLAGS="$CPPFLAGS -I$withval/include"
+                        ]
+                        )
+  AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
 		 [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
-save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -L$expat/lib"
-AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
+  save_ldflags="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$expat/lib"
+  AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
 	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
-LDFLAGS="$save_ldflags"
+  LDFLAGS="$save_ldflags"])
 AC_SUBST(EXPAT_LIBS)
 
 RPM_LIBS=""