X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=d1e04746a5f80f6d1c6e0fe230c9c4a114ba6740;hp=d77a7de715d5e0918ae4c4a50f462b16a90ee385;hb=cc6dad5cffd577eed9d001a82f08a552c2740525;hpb=a1e8950b3ac76b9b8a85d9261b07c558ad8a3c9b

diff --git a/configure.in b/configure.in
index d77a7de..d1e0474 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.124 2004-02-05 11:55:56 adam Exp $
+dnl $Id: configure.in,v 1.138 2004-04-30 19:34:05 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.10)
+AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -17,74 +17,7 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfig, pkg-config, NONE)
 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 Docbook 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
-])
-AC_SUBST(XSL_DIR)
-AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
-[
-   if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
-      XSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for htmlhelp.xsl)
-   for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-            /usr/share/sgml/docbook/xsl-stylesheets-1.* 
-   do
-     if test -f $d/htmlhelp/htmlhelp.xsl; then
-       AC_MSG_RESULT($d)
-       XSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$XSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
+YAZ_DOC
 dnl 
 dnl ----- Sockets
 checkBoth=0
@@ -115,9 +48,9 @@ if test "$openssl" != "no"; then
 	xCFLAGS="$CFLAGS";
 	if test "$openssl" != "yes"; then
 		if $openssl/bin/pkg-config --exists openssl; then
-			SSL_CFLAGS=`$openssl/bin/pkgconfig --cflags openssl`
-			SSL_LIBS=`$openssl/bin/pkgconfig --libs openssl`
-			sslver=`$openssl/bin/pkgconfig --modversion openssl`
+			SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+			SSL_LIBS=`$openssl/bin/pkg-config --libs openssl`
+			sslver=`$openssl/bin/pkg-config --modversion openssl`
 		else
                 	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
                 	SSL_LIBS="-L$openssl/lib"
@@ -139,11 +72,11 @@ if test "$openssl" != "no"; then
 			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
 		fi
 		if test "$sslver" = "yes"; then
-			SSL_LIBS="$SSL_LIBS -lssl"
+			SSL_LIBS="-lssl $SSL_LIBS"
 		fi
 	fi
 	if test "$sslver" != "no"; then
-		SSL_DEFS="-DHAVE_OPENSSL_H=1"
+		SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"
 		USE_SSL=1
 	fi
 	AC_MSG_CHECKING([for SSL])
@@ -151,7 +84,6 @@ if test "$openssl" != "no"; then
 	LIBS="$xLIBS"
 	CFLAGS="$xCFLAGS"
 fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -275,7 +207,7 @@ AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
 	oldLibs=$LIBS
 	oldCPPFLAGS=$CPPFLAGS
 	if test "$enable_tcpd" != "yes"; then