X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=698563896b50d613a2a5ca9689bda58591ad4411;hb=f722c8d9517ec491e2469cdc91a3751dd5e7a6df;hp=51392a8a390421d7cd07231c62e067885c203295;hpb=13671e7cc0f3dd4e4b02f94d64a50778c5696ba6;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 51392a8..6985638 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.55 2001-11-18 21:14:22 adam Exp $
+dnl $Id: configure.in,v 1.62 2002-03-16 11:45:00 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.3)
+AM_INIT_AUTOMAKE(yaz, 1.8.6)
 dnl
 AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs
@@ -49,11 +49,20 @@ dnl
 dnl ------ Open SSL
 openssl=no
 AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
-if test "$openssl" = "yes"; then
+if test "$openssl" != "no"; then
+	xLDFLAGS="$LDFLAGS";
+	xCFLAGS="$CFLAGS";
+	if test "$openssl" != "yes"; then
+		CFLAGS="-I$openssl/include -I$openssl/include/openssl $CFLAGS"
+		LDFLAGS="-L$openssl/lib $LDFLAGS"
+	fi
 	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)
+	else
+		LDFLAGS="$xLDFLAGS";
+		CFLAGS="$xCFLAGS";
 	fi
 fi
 dnl ------ GNU Readline
@@ -102,6 +111,7 @@ if test "$enable_tcpd" != ""; then
 fi
 dnl
 dnl ------ Headers
+AC_CHECK_HEADERS(fnmatch.h)
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
@@ -129,6 +139,14 @@ 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
@@ -185,6 +203,7 @@ dnl ------ Makefiles
 dnl
 AC_OUTPUT([
 Makefile
+yaz.spec
 util/Makefile
 odr/Makefile
 z39.50/Makefile
@@ -202,6 +221,7 @@ zoom/Makefile
 client/Makefile
 ztest/Makefile
 doc/Makefile
+doc/yaz.xml
 yaz-config
 lib/yaz-config
 ],[chmod +x yaz-config lib/yaz-config])