- (djm) [configure.ac] Enable PKCS#11 support only when we find a working
dlopen()
diff --git a/ChangeLog b/ChangeLog
index c5dc752..83259b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,8 @@
Make it compile on OSX
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
Use ssh_get_progname to fill __progname
+ - (djm) [configure.ac] Enable PKCS#11 support only when we find a working
+ dlopen()
20100210
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
diff --git a/configure.ac b/configure.ac
index 40b58c6..f4c2568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.442 2010/02/11 22:34:22 djm Exp $
+# $Id: configure.ac,v 1.443 2010/02/11 23:11:34 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.442 $)
+AC_REVISION($Revision: 1.443 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -1420,6 +1420,11 @@
waitpid \
)
+# PKCS#11 support requires dlopen() and co
+AC_SEARCH_LIBS(dlopen, dl,
+ AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support])
+)
+
# IRIX has a const char return value for gai_strerror()
AC_CHECK_FUNCS(gai_strerror,[
AC_DEFINE(HAVE_GAI_STRERROR)
@@ -4130,10 +4135,6 @@
AC_SUBST(TEST_SSH_IPV6, yes)
fi
-if test "x$enable_pkcs11" != "xno" ; then
- AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support])
-fi
-
AC_EXEEXT
AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \
openbsd-compat/Makefile openbsd-compat/regress/Makefile \