X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=173ab9f87596ba2ed8d082b600986cad75feb781;hp=16c7a515f668e93379f626745ca7b50ce10acb43;hb=0fa4ed293e6d00b6ef3f0179543a12f803c61b6d;hpb=180d8e06b6f1e7fe34b1a80ca1edde0dddf113f1

diff --git a/configure.in b/configure.in
index 16c7a51..173ab9f 100644
--- 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.39 2000-11-29 14:22:47 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,24 +113,30 @@ 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>
-	int func(void *p) { return 0; }
+	void *func(void *p) { return 0; }
 	],[
 	pthread_t pthread_id;
-	int r = pthread_create (&pthread_id, 0, func, 0);],
+	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`