Support expat version 2.2
authorJ. Ali Harlow <ali@juiblex.co.uk>
Tue Apr 24 20:58:03 2018 +0100 (2018-04-24)
changeset 684348cb0e1ac3
parent 66 d07fab627ccf
child 69 1748c5d94fe2
Support expat version 2.2
configure.ac
     1.1 --- a/configure.ac	Fri Mar 02 17:37:24 2018 +0000
     1.2 +++ b/configure.ac	Tue Apr 24 20:58:03 2018 +0100
     1.3 @@ -136,8 +136,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 >= 2.1],[:],
     1.8 -  [PKG_CHECK_MODULES(EXPAT,[expat21],[:],[EXPAT_LIBS=-lexpat])])
     1.9 +PKG_CHECK_MODULES(EXPAT,[expat >= 2.2],[:],
    1.10 +  [PKG_CHECK_MODULES(EXPAT,[expat22],[:],[EXPAT_LIBS=-lexpat])])
    1.11  PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz])
    1.12  PKG_CHECK_MODULES(LUA,[lua],[:],[LUA_LIBS=-llua])
    1.13  PKG_CHECK_MODULES(GIO,[gio-2.0])
    1.14 @@ -166,8 +166,8 @@
    1.15  AC_SUBST(GUI_LIBS)
    1.16  save_PKG_CONFIG="$PKG_CONFIG"
    1.17  PKG_CONFIG="$PKG_CONFIG --static"
    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 +PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.2 zlib gio-2.0],[:],
    1.21 +  [PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat22 zlib gio-2.0])])
    1.22  if test -n "$host_mingw"; then
    1.23      # Hacks:
    1.24      # -liconv is required for mingw. This probably stems from our use of