SSL comstack support. Separate POSIX thread support library.

[yaz-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 16c7a51..706e187 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.37 2000-10-11 10:40:56 adam Exp $
+dnl $Id: configure.in,v 1.38 2000-11-23 10:58:32 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -55,6 +55,16 @@ if test "$checkBoth" = "1"; then
 fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
+dnl ------ Open SSL
+openssl=no
+AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
+if test "$openssl" = "yes"; then
+       AC_CHECK_LIB(crypto, main)
+       AC_CHECK_LIB(ssl, SSL_new)
+       if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+               AC_CHECK_HEADERS(openssl/ssl.h)
+       fi
+fi
 dnl ------ GNU Readline
 READLINE_LIBS=""
 AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
@@ -103,8 +113,10 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable POSIX threads],[enable_threads=$enableval],[enable_threads=no])
+AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
+AC_SUBST(LIBTHREAD)
 if test "$enable_threads" = "yes"; then
+       OLIBS=$LIBS
        AC_CHECK_LIB(pthread,main)
        AC_MSG_CHECKING(for working POSIX Threads)
        AC_TRY_LINK([#include <pthread.h>
@@ -114,13 +126,17 @@ if test "$enable_threads" = "yes"; then
        int r = pthread_create (&pthread_id, 0, func, 0);],
                thread_ok=yes,thread_ok=no)
        if test "$thread_ok" = "yes"; then
+               LIBTHREAD=-lpthread
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_PTHREAD_H)
-               AC_DEFINE(_REENTRANT)
+               HAVETHREADS=1
        else
+               LIBTHREAD=""
                AC_MSG_RESULT(no)
+               HAVETHREADS=0
        fi
+       LIBS=$OLIBS
 fi
+AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
 YAZ_SRC_ROOT=`pwd`