X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz_libxml2.m4;h=5f3641dc61b997244111ef9ca2e4e7f60ee32b1f;hb=0b7662be4e6c57b66352317ab7f097117888993a;hp=9153a4b32f310c548060427699a00890a466c7ab;hpb=be8be839bb81aab9e4e52ec5287f9c4c31c66afa;p=m4-moved-to-github.git

diff --git a/yaz_libxml2.m4 b/yaz_libxml2.m4
index 9153a4b..5f3641d 100644
--- a/yaz_libxml2.m4
+++ b/yaz_libxml2.m4
@@ -1,5 +1,6 @@
 AC_DEFUN([YAZ_LIBXML2],[
 AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
+pkgmodule=""
 xml2dir=default
 XML2_VER=""
 AC_ARG_WITH(xml2,[[  --with-xml2[=PREFIX]    use libxml2 in PREFIX]],xml2dir=$withval)
@@ -47,8 +48,9 @@ fi
 ])
 
 AC_DEFUN([YAZ_LIBXSLT],[
-	xsltdir=default
 pkgmodule=""
+xsltdir=default
+yaz_xslt_pkgconfig=no
 XSLT_VER=""
 AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libXSLT in PREFIX]],xsltdir=$withval)
 
@@ -79,6 +81,7 @@ if test "$xsltdir" != "no"; then
 	XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
 	AC_MSG_RESULT($XSLT_VER)
 	m4_default([$1],[AC_DEFINE(HAVE_XSLT)])
+	yaz_xslt_pkgconfig=yes
     elif test -x $xsltdir/bin/xslt-config; then
 	XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
 	XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
@@ -113,11 +116,15 @@ fi
 if test "$exsltdir" != "no"; then
     AC_MSG_CHECKING(for libEXSLT)
     if test "$pkgmodule"; then
-	XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
-	XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
-	EXSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
-	AC_MSG_RESULT($EXSLT_VER)
-	m4_default([$1],[AC_DEFINE(HAVE_EXSLT)])
+	if test "$yaz_xslt_pkgconfig" != "yes"; then
+	    AC_MSG_RESULT([Disabled. Libxslt is not pkg-config configured])
+	else
+	    XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+	    XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+	    EXSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
+	    AC_MSG_RESULT($EXSLT_VER)
+	    m4_default([$1],[AC_DEFINE(HAVE_EXSLT)])
+	fi
     else
 	AC_MSG_RESULT(Not found)