# HG changeset patch # User J. Ali Harlow # Date 1524599883 -3600 # Node ID 4348cb0e1ac3c7fca467af236e4d59864900d22e # Parent d07fab627ccf400e1c7b71ce7a1003277ba2c3f5 Support expat version 2.2 diff -r d07fab627ccf -r 4348cb0e1ac3 configure.ac --- a/configure.ac Fri Mar 02 17:37:24 2018 +0000 +++ b/configure.ac Tue Apr 24 20:58:03 2018 +0100 @@ -136,8 +136,8 @@ ################################################## PKG_CHECK_MODULES(WHELK,[whelk]) PKG_CHECK_MODULES(RAZOR,[razor >= 0.5.4],[:],[RAZOR_LIBS=-lrazor]) -PKG_CHECK_MODULES(EXPAT,[expat >= 2.1],[:], - [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])]) +PKG_CHECK_MODULES(EXPAT,[expat >= 2.2],[:], + [PKG_CHECK_MODULES(EXPAT,[expat22],[:],[EXPAT_LIBS=-lexpat])]) PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz]) PKG_CHECK_MODULES(LUA,[lua],[:],[LUA_LIBS=-llua]) PKG_CHECK_MODULES(GIO,[gio-2.0]) @@ -166,8 +166,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 >= 2.1 zlib gio-2.0],[:], - [PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat21 zlib gio-2.0])]) +PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.2 zlib gio-2.0],[:], + [PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat22 zlib gio-2.0])]) if test -n "$host_mingw"; then # Hacks: # -liconv is required for mingw. This probably stems from our use of