X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=524ee200c63ae11c151cf02e4a6965a2527b157c;hb=fde978ee5097a46b9a162dcff3b4b15d24c8c82f;hp=1885daf232595ea6f9471ab8451d23d4e285162a;hpb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 1885daf..524ee20 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.54 2001-11-13 23:00:42 adam Exp $
+dnl $Id: configure.in,v 1.59 2002-01-17 21:04:43 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.2)
+AM_INIT_AUTOMAKE(yaz, 1.8.5)
 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)