X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=adc865f45403ca435acc394792ed4b64f2f750be;hb=ae166973a7ad342554ec7cd39135561523a3083f;hp=a12e1558aca866dc762150b3702f441ae08a01eb;hpb=07d46508569f470e1577a66c0f7adce024b4eec6;p=yazpp-moved-to-github.git

diff --git a/configure.in b/configure.in
index a12e155..adc865f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.5)
+AM_INIT_AUTOMAKE("yaz++",0.8)
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -8,12 +8,39 @@ AC_HEADER_STDC
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
-YAZ_INIT(threads)
+YAZ_INIT(threads,2.0.12)
+
+AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
+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`
+		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
 
 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
@@ -37,7 +64,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
@@ -60,27 +87,24 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ])
 dnl 
 
+AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
+AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")
 
 AC_SUBST(YAZPP_SRC_ROOT)
 AC_SUBST(YAZPP_BUILD_ROOT)
 YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZPP_BUILD_ROOT=`pwd`
 
-if test -f ${srcdir}/src/yaz++-config.in; then
-        rm ${srcdir}/src/yaz++-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz++-config.in >${srcdir}/src/yaz++-config.in
 AC_OUTPUT([
 	Makefile
 	src/Makefile
 	include/Makefile
 	include/yaz++/Makefile
+	zlint/Makefile
 	yaz++-config
-	src/yaz++-config
 	zoom/Makefile
-	lib/Makefile
 	doc/Makefile
 	doc/yaz++.xml
 	doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
         doc/tkl.xsl
-],[chmod +x yaz++-config src/yaz++-config])
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config >src/yaz++-config && chmod +x yaz++-config src/yaz++-config])