X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=168eaac15b24fd07f58b09416bd6df898373700c;hb=3bb2e157affd19490974257a252472716d7858b3;hp=831bffba2ccac19f5a665d068c42c32e27b59ef4;hpb=c63109c0af72dca3fc9b677c56797fa47b874908;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 831bffb..168eaac 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.63 2002-03-16 11:58:41 adam Exp $
+dnl $Id: configure.in,v 1.66 2002-03-22 20:53:13 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.8.6)
 dnl
@@ -11,6 +11,51 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
+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/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/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 
 dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(EXTRAMODULE)
@@ -49,22 +94,35 @@ dnl
 dnl ------ Open SSL
 openssl=no
 AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
+AC_SUBST(SSL_CFLAGS)
+AC_SUBST(SSL_LIBS)
+AC_SUBST(SSL_DEFS)
+USE_SSL=0
+SSL_CFLAGS=""
+SSL_LIBS=""
+SSL_DEFS=""
 if test "$openssl" != "no"; then
-	xLDFLAGS="$LDFLAGS";
+	xLIBS="$LIBS";
 	xCFLAGS="$CFLAGS";
 	if test "$openssl" != "yes"; then
-		CFLAGS="-I$openssl/include -I$openssl/include/openssl $CFLAGS"
-		LDFLAGS="-L$openssl/lib $LDFLAGS"
+                SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+                SSL_LIBS="-L$openssl/lib"
+		CFLAGS="$SSL_CFLAGS $CFLAGS"
+		LIBS="$SSL_LIBS $LIBS"
 	fi
-	AC_CHECK_LIB(crypto, main)
+	AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
+        LIBS="$LIBS $SSL_LIBS"
 	AC_CHECK_LIB(ssl, SSL_new)
 	if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-		AC_CHECK_HEADERS(openssl/ssl.h)
-	else
-		LDFLAGS="$xLDFLAGS";
-		CFLAGS="$xCFLAGS";
+                SSL_LIBS="$SSL_LIBS -lssl"
+		AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1])
+        else
+                SSL_LIBS=""
 	fi
+	LIBS="$xLIBS"
+	CFLAGS="$xCFLAGS"
 fi
+AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
 AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
@@ -199,7 +257,7 @@ if test -f ${srcdir}/lib/yaz-config.in; then
 fi
 sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
-SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib include client ztest"
+SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
@@ -224,6 +282,9 @@ client/Makefile
 ztest/Makefile
 doc/Makefile
 doc/yaz.xml
+doc/yazhtml.dsl
+doc/yazphp.dsl
+doc/yazprint.dsl
 yaz-config
 lib/yaz-config
 ],[chmod +x yaz-config lib/yaz-config])