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

diff --git a/configure.in b/configure.in
index 05517ad..adc865f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++",0.7.2)
+AM_INIT_AUTOMAKE("yaz++",0.8)
 
 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.12)
 
+AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
 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`
+		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
@@ -40,7 +40,7 @@ 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
@@ -64,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
@@ -100,12 +100,11 @@ AC_OUTPUT([
 	src/Makefile
 	include/Makefile
 	include/yaz++/Makefile
+	zlint/Makefile
 	yaz++-config
 	zoom/Makefile
-	lib/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])