diff options
author | Damien Miller <djm@mindrot.org> | 2010-02-12 10:11:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-02-12 10:11:34 +1100 |
commit | b3c9f78711bde96415d22046af2c0f8c071a7e6f (patch) | |
tree | 2d0ca346265264f2774a1b8f2c3e647d6e22f6e0 | |
parent | dfa4156dbd4aa45464b2ea6b867bcaa483bed134 (diff) |
- (djm) [configure.ac] Enable PKCS#11 support only when we find a working
dlopen()
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 13 |
2 files changed, 9 insertions, 6 deletions
@@ -44,6 +44,8 @@ | |||
44 | Make it compile on OSX | 44 | Make it compile on OSX |
45 | - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] | 45 | - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] |
46 | Use ssh_get_progname to fill __progname | 46 | Use ssh_get_progname to fill __progname |
47 | - (djm) [configure.ac] Enable PKCS#11 support only when we find a working | ||
48 | dlopen() | ||
47 | 49 | ||
48 | 20100210 | 50 | 20100210 |
49 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for | 51 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for |
diff --git a/configure.ac b/configure.ac index 40b58c64f..f4c25683c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.442 2010/02/11 22:34:22 djm Exp $ | 1 | # $Id: configure.ac,v 1.443 2010/02/11 23:11:34 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.442 $) | 18 | AC_REVISION($Revision: 1.443 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -1420,6 +1420,11 @@ AC_CHECK_FUNCS( \ | |||
1420 | waitpid \ | 1420 | waitpid \ |
1421 | ) | 1421 | ) |
1422 | 1422 | ||
1423 | # PKCS#11 support requires dlopen() and co | ||
1424 | AC_SEARCH_LIBS(dlopen, dl, | ||
1425 | AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support]) | ||
1426 | ) | ||
1427 | |||
1423 | # IRIX has a const char return value for gai_strerror() | 1428 | # IRIX has a const char return value for gai_strerror() |
1424 | AC_CHECK_FUNCS(gai_strerror,[ | 1429 | AC_CHECK_FUNCS(gai_strerror,[ |
1425 | AC_DEFINE(HAVE_GAI_STRERROR) | 1430 | AC_DEFINE(HAVE_GAI_STRERROR) |
@@ -4130,10 +4135,6 @@ else | |||
4130 | AC_SUBST(TEST_SSH_IPV6, yes) | 4135 | AC_SUBST(TEST_SSH_IPV6, yes) |
4131 | fi | 4136 | fi |
4132 | 4137 | ||
4133 | if test "x$enable_pkcs11" != "xno" ; then | ||
4134 | AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support]) | ||
4135 | fi | ||
4136 | |||
4137 | AC_EXEEXT | 4138 | AC_EXEEXT |
4138 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ | 4139 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ |
4139 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ | 4140 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ |