X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=e6ef61b743705f0407d2dd4953721de77b1492dc;hp=bee8d0f06d5f26e7698e4888c05cf10007e12e6e;hb=50606c10e645308dddb9c8d0e676b33ce38f1df8;hpb=6f7757087a49db5fb3fa4f3b12b8b67ebbbe3aa3 diff --git a/configure.ac b/configure.ac index bee8d0f..e6ef61b 100644 --- a/configure.ac +++ b/configure.ac @@ -348,15 +348,17 @@ YAZ_LIBXML2([ xml_enabled=true ]) -YAZ_LIBXSLT([ - AC_DEFINE(YAZ_HAVE_XSLT) - YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" - ]) -YAZ_LIBEXSLT([ - AC_DEFINE(YAZ_HAVE_EXSLT) - YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" - ]) - +if test "$xml_enabled" = "true"; then + YAZ_LIBXSLT([ + AC_DEFINE(YAZ_HAVE_XSLT) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" + ]) + YAZ_LIBEXSLT([ + AC_DEFINE(YAZ_HAVE_EXSLT) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" + ]) + +fi YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS" if test "$XML2_LIBS"; then @@ -390,9 +392,9 @@ YAZ_BUILD_ROOT=`pwd` dnl dnl ------ versioning dnl -WIN_FILEVERSION=`echo $PACKAGE_VERSION | awk 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` +WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` AC_SUBST([WIN_FILEVERSION]) -YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | awk 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'` +YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'` AC_SUBST([YAZ_VERSION_HEX]) if test ${srcdir}/.git; then VERSION_SHA1=`git show --pretty=format:%H|head -1`