X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=dcef686c94362b804204cc18ffd2e852e1e538cd;hb=ece93a39d9b88e80aa702e137052980fd9fc9e8b;hp=c6265bcd56922af3007d42fc9467a2f3c9ab26f6;hpb=8bc5c9154d4c59571b6a6f19d8082a230d3c8a8a;p=yazpp-moved-to-github.git diff --git a/configure.in b/configure.in index c6265bc..dcef686 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(configure.in) -AM_INIT_AUTOMAKE("yaz++",0.7.8) +AM_INIT_AUTOMAKE("yaz++",0.8) AC_PROG_CC AC_PROG_CPP @@ -8,39 +8,11 @@ AC_HEADER_STDC AM_DISABLE_SHARED AM_PROG_LIBTOOL -YAZ_INIT(threads,2.0.10) - -dnl -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/xslt-config; then - xsltdir=$d - fi - done -fi -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 -fi - +YAZ_INIT(threads,2.0.12) dnl dnl ----- DOCBOOK DTD AC_SUBST(DTD_DIR) -AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], +AC_ARG_WITH(dtd, [ --with-dtd[=DIR] use docbookx.dtd in DIR], [ if test -f "$withval/docbookx.dtd"; then DTD_DIR=$withval @@ -64,7 +36,7 @@ AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], fi ]) AC_SUBST(DSSSL_DIR) -AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbook.dsl], +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] use DSSSL in DIR/{html,print}/docbook.dsl], [ if test -f "$withval/html/docbook.dsl"; then DSSSL_DIR=$withval @@ -100,11 +72,11 @@ AC_OUTPUT([ src/Makefile include/Makefile include/yaz++/Makefile + zlint/Makefile yaz++-config zoom/Makefile doc/Makefile 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])