X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=a41d27c7a7905e474130760965e86594030d560b;hp=ced0e39159733677b99cc3f027979ad513b8c062;hb=3110991d8a797c0e91037e9e615090ec57e22359;hpb=645fcfb030d718ce708a396309fb8d69bd8d7afb

diff --git a/configure.in b/configure.in
index ced0e39..a41d27c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,23 +1,29 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(yazproxy,0.8)
+AM_INIT_AUTOMAKE(yazproxy,1.1.0)
 
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
 AC_HEADER_STDC
-AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
-YAZPP_INIT(threads,0.8)
+YAZPP_INIT(threads,1.0)
+if test -z "$YAZPPLIB"; then
+	AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+USEMARCON_INIT
 
 AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday)
+AC_CHECK_HEADERS(pwd.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h unistd.h)
+AC_CHECK_LIB(dl,dlopen)
 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
+xsltdir=default
+AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
+if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
 	for d in /usr /usr/local; do
 		if test -x $d/bin/xslt-config; then
 			xsltdir=$d
@@ -34,64 +40,17 @@ if test "$xsltdir" != "no"; then
 		AC_DEFINE(HAVE_XSLT)
 	else
 		AC_MSG_RESULT(Not found)
+                if test "$xsltdir" = "default"; then
+                        AC_MSG_WARN([Libxslt development libraries not found.])
+                else
+                        AC_MSG_ERROR([libxslt development libraries not found.])                fi
 	fi
 fi
 
-dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]          use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2* \
-         /usr/share/sgml/docbook/xml-dtd-4.1 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-	    /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-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
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-dnl 
-
 AC_SUBST(YAZPROXY_SRC_ROOT)
 AC_SUBST(YAZPROXY_BUILD_ROOT)
 YAZPROXY_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZPROXY_BUILD_ROOT=`pwd`
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile