1.1 --- a/configure.ac	Thu Apr 14 11:59:56 2016 +0100
     1.2 +++ b/configure.ac	Thu Jun 09 17:37:09 2016 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  dnl Process this file with autoconf to produce a configure script.
     1.5  
     1.6  AC_PREREQ(2.59c)
     1.7 -AC_INIT([razor], [0.6.1], [ali@juiblex.co.uk])
     1.8 +AC_INIT([razor], [0.6.2], [ali@juiblex.co.uk])
     1.9  AM_INIT_AUTOMAKE([])
    1.10  AM_CONFIG_HEADER([config.h])
    1.11  AM_MAINTAINER_MODE
    1.12 @@ -235,19 +235,23 @@
    1.13  AC_SUBST(ZLIB_LIBS)
    1.14  
    1.15  EXPAT_LIB=""
    1.16 -AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
    1.17 -                      [
    1.18 -                      expat=$withval
    1.19 -                      CPPFLAGS="$CPPFLAGS -I$withval/include"
    1.20 -                      ]
    1.21 -                      )
    1.22 -AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
    1.23 +PKG_CHECK_MODULES(EXPAT, [expat21],
    1.24 +  [AC_DEFINE([HAVE_EXPAT_H])
    1.25 +   CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"],
    1.26 +  [AC_ARG_WITH(expat, [  --with-expat=<dir>      If expat 2.1 isn't available,
    1.27 +                          fallback to using legacy expat from here],
    1.28 +                        [
    1.29 +                        expat=$withval
    1.30 +                        CPPFLAGS="$CPPFLAGS -I$withval/include"
    1.31 +                        ]
    1.32 +                        )
    1.33 +  AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)], 
    1.34  		 [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
    1.35 -save_ldflags="$LDFLAGS"
    1.36 -LDFLAGS="$LDFLAGS -L$expat/lib"
    1.37 -AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
    1.38 +  save_ldflags="$LDFLAGS"
    1.39 +  LDFLAGS="$LDFLAGS -L$expat/lib"
    1.40 +  AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-L$expat/lib -lexpat"],
    1.41  	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
    1.42 -LDFLAGS="$save_ldflags"
    1.43 +  LDFLAGS="$save_ldflags"])
    1.44  AC_SUBST(EXPAT_LIBS)
    1.45  
    1.46  RPM_LIBS=""