1.1 --- a/configure.ac	Mon Nov 02 19:04:58 2015 +0000
     1.2 +++ b/configure.ac	Mon Apr 18 14:55:22 2016 +0100
     1.3 @@ -112,7 +112,8 @@
     1.4  ##################################################
     1.5  PKG_CHECK_MODULES(WHELK,[whelk])
     1.6  PKG_CHECK_MODULES(RAZOR,[razor >= 0.5.4],[:],[RAZOR_LIBS=-lrazor])
     1.7 -PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat])
     1.8 +PKG_CHECK_MODULES(EXPAT,[expat >= 2.1],[:],
     1.9 +  [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])])
    1.10  PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
    1.11  PKG_CHECK_MODULES(GIO,[gio-2.0])
    1.12  PKG_CHECK_MODULES(GTK,[gtk+-2.0])
    1.13 @@ -136,7 +137,8 @@
    1.14  AC_SUBST(GUI_LIBS)
    1.15  save_PKG_CONFIG="$PKG_CONFIG"
    1.16  PKG_CONFIG="$PKG_CONFIG --static"
    1.17 -PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat zlib gio-2.0])
    1.18 +PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.1 zlib gio-2.0],[:],
    1.19 +  [PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat21 zlib gio-2.0])])
    1.20  if test -n "$host_mingw"; then
    1.21      # Hack: -liconv is required for mingw. This probably stems from our use of
    1.22      # libiconv rather than win-iconv that Fedora uses, but should be addressed