diff options
author | Damien Miller <djm@mindrot.org> | 2010-02-12 09:34:22 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-02-12 09:34:22 +1100 |
commit | d8f60022727f1d57efe7261b856d5e84a4b28cbe (patch) | |
tree | 33fa78e6f77a15258305f121378609de0eea2a3a /configure.ac | |
parent | d400da5ba8d7e5822647c472c7dfbfecb55c2152 (diff) |
- (djm) [INSTALL Makefile.in README.smartcard configure.ac scard-opensc.c]
[scard.c scard.h pkcs11.h scard/Makefile.in scard/Ssh.bin.uu scard/Ssh.java]
Remove obsolete smartcard support
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 73 |
1 files changed, 3 insertions, 70 deletions
diff --git a/configure.ac b/configure.ac index 717d315fd..40b58c64f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.441 2010/02/11 22:21:02 djm Exp $ | 1 | # $Id: configure.ac,v 1.442 2010/02/11 22:34:22 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.441 $) | 18 | AC_REVISION($Revision: 1.442 $) |
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) |
@@ -3263,73 +3263,6 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then | |||
3263 | AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr]) | 3263 | AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr]) |
3264 | fi | 3264 | fi |
3265 | 3265 | ||
3266 | SCARD_MSG="no" | ||
3267 | # Check whether user wants sectok support | ||
3268 | AC_ARG_WITH(sectok, | ||
3269 | [ --with-sectok Enable smartcard support using libsectok], | ||
3270 | [ | ||
3271 | if test "x$withval" != "xno" ; then | ||
3272 | if test "x$withval" != "xyes" ; then | ||
3273 | CPPFLAGS="$CPPFLAGS -I${withval}" | ||
3274 | LDFLAGS="$LDFLAGS -L${withval}" | ||
3275 | if test ! -z "$need_dash_r" ; then | ||
3276 | LDFLAGS="$LDFLAGS -R${withval}" | ||
3277 | fi | ||
3278 | if test ! -z "$blibpath" ; then | ||
3279 | blibpath="$blibpath:${withval}" | ||
3280 | fi | ||
3281 | fi | ||
3282 | AC_CHECK_HEADERS(sectok.h) | ||
3283 | if test "$ac_cv_header_sectok_h" != yes; then | ||
3284 | AC_MSG_ERROR(Can't find sectok.h) | ||
3285 | fi | ||
3286 | AC_CHECK_LIB(sectok, sectok_open) | ||
3287 | if test "$ac_cv_lib_sectok_sectok_open" != yes; then | ||
3288 | AC_MSG_ERROR(Can't find libsectok) | ||
3289 | fi | ||
3290 | AC_DEFINE(SMARTCARD, 1, | ||
3291 | [Define if you want smartcard support]) | ||
3292 | AC_DEFINE(USE_SECTOK, 1, | ||
3293 | [Define if you want smartcard support | ||
3294 | using sectok]) | ||
3295 | SCARD_MSG="yes, using sectok" | ||
3296 | fi | ||
3297 | ] | ||
3298 | ) | ||
3299 | |||
3300 | # Check whether user wants OpenSC support | ||
3301 | OPENSC_CONFIG="no" | ||
3302 | AC_ARG_WITH(opensc, | ||
3303 | [ --with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)], | ||
3304 | [ | ||
3305 | if test "x$withval" != "xno" ; then | ||
3306 | AC_PATH_PROG(PKGCONFIG, pkg-config, no) | ||
3307 | AC_MSG_CHECKING(how to get opensc config) | ||
3308 | if test "x$withval" != "xyes" -a "x$PKGCONFIG" = "xno"; then | ||
3309 | OPENSC_CONFIG="$withval/bin/opensc-config" | ||
3310 | elif test -f "$withval/src/libopensc/libopensc.pc"; then | ||
3311 | OPENSC_CONFIG="$PKGCONFIG $withval/src/libopensc/libopensc.pc" | ||
3312 | elif test "x$PKGCONFIG" != "xno"; then | ||
3313 | OPENSC_CONFIG="$PKGCONFIG libopensc" | ||
3314 | else | ||
3315 | AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) | ||
3316 | fi | ||
3317 | AC_MSG_RESULT($OPENSC_CONFIG) | ||
3318 | if test "$OPENSC_CONFIG" != "no"; then | ||
3319 | LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` | ||
3320 | LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` | ||
3321 | CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" | ||
3322 | LIBS="$LIBS $LIBOPENSC_LIBS" | ||
3323 | AC_DEFINE(SMARTCARD) | ||
3324 | AC_DEFINE(USE_OPENSC, 1, | ||
3325 | [Define if you want smartcard support | ||
3326 | using OpenSC]) | ||
3327 | SCARD_MSG="yes, using OpenSC" | ||
3328 | fi | ||
3329 | fi | ||
3330 | ] | ||
3331 | ) | ||
3332 | |||
3333 | # Check libraries needed by DNS fingerprint support | 3266 | # Check libraries needed by DNS fingerprint support |
3334 | AC_SEARCH_LIBS(getrrsetbyname, resolv, | 3267 | AC_SEARCH_LIBS(getrrsetbyname, resolv, |
3335 | [AC_DEFINE(HAVE_GETRRSETBYNAME, 1, | 3268 | [AC_DEFINE(HAVE_GETRRSETBYNAME, 1, |
@@ -4204,7 +4137,7 @@ fi | |||
4204 | AC_EXEEXT | 4137 | AC_EXEEXT |
4205 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ | 4138 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ |
4206 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ | 4139 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ |
4207 | scard/Makefile ssh_prng_cmds survey.sh]) | 4140 | ssh_prng_cmds survey.sh]) |
4208 | AC_OUTPUT | 4141 | AC_OUTPUT |
4209 | 4142 | ||
4210 | # Print summary of options | 4143 | # Print summary of options |