# HG changeset patch
# User J. Ali Harlow <ali@juiblex.co.uk>
# Date 1460987722 -3600
# Node ID c264564e4c89b208ddffa7aa5dd09a6ac23e83dd
# Parent  8301d58eb21ff18a8438a257c94e8b12120e80af
Support EL6's expat21 compatibility package

diff -r 8301d58eb21f -r c264564e4c89 configure.ac
--- a/configure.ac	Fri Apr 15 13:09:11 2016 +0100
+++ b/configure.ac	Mon Apr 18 14:55:22 2016 +0100
@@ -112,7 +112,8 @@
 ##################################################
 PKG_CHECK_MODULES(WHELK,[whelk])
 PKG_CHECK_MODULES(RAZOR,[razor >= 0.5.4],[:],[RAZOR_LIBS=-lrazor])
-PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
+PKG_CHECK_MODULES(EXPAT,[expat >= 2.1],[:],
+  [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])])
 PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
 PKG_CHECK_MODULES(GIO,[gio-2.0])
 PKG_CHECK_MODULES(GTK,[gtk+-2.0])
@@ -136,7 +137,8 @@
 AC_SUBST(GUI_LIBS)
 save_PKG_CONFIG="$PKG_CONFIG"
 PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat zlib gio-2.0])
+PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.1 zlib gio-2.0],[:],
+  [PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat21 zlib gio-2.0])])
 if test -n "$host_mingw"; then
     # Hack: -liconv is required for mingw. This probably stems from our use of
     # libiconv rather than win-iconv that Fedora uses, but should be addressed