X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=4763db175fcb407440824ab1df8ca8b079c195b4;hp=55076ad25a1d868d00d7f06ea926dc0a30b9a7d3;hb=72d242591ea2f6374ffb3166383f3ffddc342215;hpb=fa4bfbc45c934a9431f40588c519085eff9e8ae6

diff --git a/configure.in b/configure.in
index 55076ad..4763db1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,16 @@
-dnl YAZ Toolkit, Index Data 1994-2002
+dnl YAZ Toolkit, Index Data 1994-2003
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.91 2002-09-20 22:23:13 adam Exp $
+dnl $Id: configure.in,v 1.103 2003-02-12 15:06:42 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.9.1)
+AM_INIT_AUTOMAKE(yaz, 1.9.3)
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
+AC_CHECK_PROGS(YACC, 'bison -y')
+test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
@@ -23,7 +25,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
 ],[
    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.2* \
          /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
@@ -47,8 +49,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ],[
    AC_MSG_CHECKING(for docbook.dsl)
    for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
+            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -174,7 +175,7 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi
@@ -184,12 +185,24 @@ AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
 	AC_TRY_COMPILE([
 	#include <sys/types.h>
 	#include <sys/socket.h>
-	extern accept(int, struct sockaddr *, socklen_t *);
+	#ifdef __cplusplus
+	extern "C" {
+	#endif
+	extern int accept(int, struct sockaddr *, socklen_t *);
+	#ifdef __cplusplus
+	}
+	#endif
 	],,[ac_cv_check_socklen_t=socklen_t],[
 		AC_TRY_COMPILE([
 		#include <sys/types.h>
 		#include <sys/socket.h>
-		extern accept(int, struct sockaddr *, size_t t *);
+		#ifdef __cplusplus
+		extern "C" {
+		#endif
+		extern int accept(int, struct sockaddr *, size_t t *);
+		#ifdef __cplusplus
+		}
+		#endif
 		],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
 	])
 ])
@@ -225,7 +238,7 @@ if test "$enable_tcpd" != ""; then
 fi
 dnl
 dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h)
+AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h)
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
@@ -295,6 +308,31 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl
+dnl ----- XML/XSLT
+AC_SUBST(XSLT_LIB)
+AC_SUBST(XSLT_CFLAGS)
+xsltdir=NONE
+AC_ARG_WITH(xslt, [  --with-xslt[=PREFIX]    Use libxslt in PREFIX/{lib,include}],[xsltdir=$withval])
+if test "x$xsltdir" = "xNONE"; then
+	for d in /usr /usr/local; do
+		if test -x $d/bin/xslt-config; then
+			xsltdir=$d
+		fi
+	done
+fi
+if true; then
+	AC_MSG_CHECKING(for XSLT)
+	if test -x $xsltdir/bin/xslt-config; then
+		XSLT_LIB=`$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 ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
 if test "$enable_memdebug" = "yes"; then
@@ -309,11 +347,6 @@ AC_SUBST(YAZ_BUILD_ROOT)
 YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZ_BUILD_ROOT=`pwd`
 dnl
-if test -f ${srcdir}/lib/yaz-config.in; then
-	rm ${srcdir}/lib/yaz-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
-dnl
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([
@@ -326,8 +359,7 @@ ill/Makefile
 zutil/Makefile
 comstack/Makefile
 ccl/Makefile
-tab/Makefile
-retrieval/Makefile
+cql/Makefile
 server/Makefile
 include/Makefile
 include/yaz/Makefile
@@ -340,6 +372,7 @@ doc/yaz.xml
 doc/yazhtml.dsl
 doc/yazphp.dsl
 doc/yazprint.dsl
+doc/tkl.xsl
+etc/Makefile
 yaz-config
-lib/yaz-config
-],[chmod +x yaz-config lib/yaz-config])
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])