X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=b1706633aad8f46f552e3d776fa195ba7b042e55;hp=4649b05e41254ccfb7048e90116de0578d927b13;hb=ab004a9c8d93f4f906ce643e306efe9dece8a2ce;hpb=c6763d9a3455defdc959a7a434eff7323349679d diff --git a/configure.in b/configure.in index 4649b05..b170663 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(configure.in) -AM_INIT_AUTOMAKE("yaz++",0.7) +AM_INIT_AUTOMAKE("yaz++",0.7.7) AC_PROG_CC AC_PROG_CPP @@ -8,30 +8,30 @@ AC_HEADER_STDC AM_DISABLE_SHARED AM_PROG_LIBTOOL -YAZ_INIT(threads) +YAZ_INIT(threads,2.0.10) dnl -dnl ----- libXML2 -AC_SUBST(XML2_LIBS) -AC_SUBST(XML2_CFLAGS) -xml2dir=yes -AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval]) -if test "$xml2dir" = "yes"; then +dnl ----- libXSLT +AC_SUBST(XSLT_LIBS) +AC_SUBST(XSLT_CFLAGS) +xsltdir=yes +AC_ARG_WITH(xslt, [ --with-xslt[=PREFIX] use libxslt in PREFIX],[xsltdir=$withval]) +if test "$xsltdir" = "yes"; then for d in /usr /usr/local; do - if test -x $d/bin/xml2-config; then - xml2dir=$d + if test -x $d/bin/xslt-config; then + xsltdir=$d fi done fi -if test "$xml2dir" != "no"; then - AC_MSG_CHECKING(for libXML2) - if test -x $xml2dir/bin/xml2-config; then - XML2_LIBS=`$xml2dir/bin/xml2-config --libs` - LIBS="$XML2_LIBS $LIBS" - XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags` - XML2_VER=`$xml2dir/bin/xml2-config --version` - AC_MSG_RESULT($XML2_VER) - AC_DEFINE(HAVE_XML2) +if test "$xsltdir" != "no"; then + AC_MSG_CHECKING(for libXSLT) + if test -x $xsltdir/bin/xslt-config; then + XSLT_LIBS=`$xsltdir/bin/xslt-config --libs` + LIBS="$XSLT_LIBS $LIBS" + XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags` + XSLT_VER=`$xsltdir/bin/xslt-config --version` + AC_MSG_RESULT($XSLT_VER) + AC_DEFINE(HAVE_XSLT) else AC_MSG_RESULT(Not found) fi @@ -107,4 +107,5 @@ AC_OUTPUT([ doc/yaz++.xml doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl doc/tkl.xsl + etc/Makefile ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config >src/yaz++-config && chmod +x yaz++-config src/yaz++-config])