X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=d1ed8241f5b410437c0dc5170e4446783fe1ad40;hp=a5fca8ed48ca5c5c3d749d7324822c02dc721b54;hb=0aad40fcb08a072aebd1dd352bc831f43d1644d7;hpb=61a2c61568817a54422e52a1fe242b8ee1857920 diff --git a/configure.ac b/configure.ac index a5fca8e..d1ed824 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.22 2006-06-07 10:48:45 adam 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.21],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -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