summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8e2a092)
which on the system uses /bin/pkg-config. However the output of /bin/pkgconfig
is not the same xslt as the one returned by /opt/csw/bin/xslt-config .
The configure system now disables libexslt if libxslt was not configured
using pkg-config also .
AC_DEFUN([YAZ_LIBXML2],[
AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
AC_DEFUN([YAZ_LIBXML2],[
AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
xml2dir=default
XML2_VER=""
AC_ARG_WITH(xml2,[[ --with-xml2[=PREFIX] use libxml2 in PREFIX]],xml2dir=$withval)
xml2dir=default
XML2_VER=""
AC_ARG_WITH(xml2,[[ --with-xml2[=PREFIX] use libxml2 in PREFIX]],xml2dir=$withval)
fi
fi
if test -z "$pkgmodule"; then
fi
fi
if test -z "$pkgmodule"; then
+ AC_MSG_RESULT([using xml2-config])
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then
xml2dir=$d
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then
xml2dir=$d
])
AC_DEFUN([YAZ_LIBXSLT],[
])
AC_DEFUN([YAZ_LIBXSLT],[
+xsltdir=default
+yaz_xslt_pkgconfig=no
XSLT_VER=""
AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libXSLT in PREFIX]],xsltdir=$withval)
XSLT_VER=""
AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libXSLT in PREFIX]],xsltdir=$withval)
XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
AC_MSG_RESULT($XSLT_VER)
m4_default([$1],[AC_DEFINE(HAVE_XSLT)])
XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
AC_MSG_RESULT($XSLT_VER)
m4_default([$1],[AC_DEFINE(HAVE_XSLT)])
elif test -x $xsltdir/bin/xslt-config; then
XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
elif test -x $xsltdir/bin/xslt-config; then
XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
if test "$exsltdir" != "no"; then
AC_MSG_CHECKING(for libEXSLT)
if test "$pkgmodule"; then
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)
else
AC_MSG_RESULT(Not found)