YAZ' configure searches for OpenSSL by default.

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

diff --git a/configure.ac b/configure.ac
index 8430990..d1ed824 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.15 2006-05-23 09:40:43 marc Exp $
+dnl $Id: configure.ac,v 1.23 2006-06-09 13:29:21 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.21],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -47,13 +47,13 @@ AC_CHECK_FUNC(gethostbyname, ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
 dnl
 dnl ------ OpenSSL
 AC_SUBST(SSL_CFLAGS)
-openssl=no
+openssl=default
 AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 SSL_CFLAGS=""
 SSL_LIBPATH=""
 if test "$openssl" != "no"; then
        sslver=no
-       if test "$openssl" != "yes"; then
+       if test "$openssl" != "yes" -a "$openssl" != "default"; then
                if test -x $openssl/bin/pkg-config; then
                        if $openssl/bin/pkg-config --exists openssl; then
                                SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
@@ -99,7 +99,9 @@ if test "$openssl" != "no"; then
        else
                SSL_CFLAGS=""
                AC_MSG_RESULT([None])
-               AC_MSG_ERROR([OpenSSL development libraries missing])
+               if test "$openssl" != "default"; then
+                       AC_MSG_ERROR([OpenSSL development libraries missing])
+               fi
        fi
 fi
 dnl
@@ -358,12 +360,9 @@ client/Makefile
 ztest/Makefile
 zoom/Makefile
 doc/Makefile
-doc/yaz.xml
+doc/local.ent
 doc/common/Makefile
-doc/common/html.dsl
-doc/common/html.xsl
 doc/common/print.dsl
-doc/common/tkl.xsl
 etc/Makefile
 yaz-config
 Doxyfile
@@ -381,17 +380,14 @@ Build distribution tarball with
 
 Verify distribution tarball with
   make distcheck
-
-Or just build the Debian packages without configuring
-  dpkg-buildpackage -rfakeroot
 '
 
 echo \
 "------------------------------------------------------------------------
 Configuration:
 
-  Package:                    ${PACKAGE}
-  Version:                    ${VERSION}
+  YAZ Package:                ${PACKAGE}
+  YAZ Version:                ${VERSION}
   Bugreport:                  ${PACKAGE_BUGREPORT}
   Source code location:       ${srcdir}
   C Preprocessor:             ${CPP}