X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=60411a1375bc12bae90955ba72074e5b6ab8b84b;hb=d50425318f3ef8e1fce265519eb8ce2dcfaa51b8;hp=698563896b50d613a2a5ca9689bda58591ad4411;hpb=8e0cda1d5cd32573e71ba7246df71b2e1a3815a4;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 6985638..60411a1 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.62 2002-03-16 11:45:00 adam Exp $
+dnl $Id: configure.in,v 1.64 2002-03-18 12:22:00 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.8.6)
 dnl
@@ -49,22 +49,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"],
@@ -123,6 +136,7 @@ HAVETHREADS=0
 CFLAGSTHREADS=""
 LIBTHREAD=""
 dnl
+dnl ------ GNU threads
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
 AC_SUBST(LIBPTH)
 if test "$enable_pth" = "yes"; then
@@ -139,14 +153,6 @@ if test "$enable_pth" = "yes"; then
 	LIBS=$OLIBS
 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
-	AC_DEFINE(TRACE_XMALLOC,2)
-elif test "$enable_memdebug" = "no"; then
-	AC_DEFINE(TRACE_XMALLOC,0)
-fi
-dnl
 dnl ------ POSIX Threads
 AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
@@ -186,6 +192,15 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	LIBS=$OLIBS
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
+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
+	AC_DEFINE(TRACE_XMALLOC,2)
+elif test "$enable_memdebug" = "no"; then
+	AC_DEFINE(TRACE_XMALLOC,0)
+fi
+dnl
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
 AC_SUBST(YAZ_BUILD_ROOT)