tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. 

Make --without-opensc work.
This commit is contained in:
Tim Rice 2005-03-17 13:37:04 -08:00
parent c3939e22fd
commit 12ee8e241e
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20050317
- (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
Make --without-opensc work.
20050314 20050314
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2005/03/10 10:15:02 - dtucker@cvs.openbsd.org 2005/03/10 10:15:02
@ -2364,4 +2368,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3720 2005/03/15 01:24:51 tim Exp $ $Id: ChangeLog,v 1.3721 2005/03/17 21:37:04 tim Exp $

39
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.250 2005/03/07 09:21:37 tim Exp $ # $Id: configure.ac,v 1.251 2005/03/17 21:37:04 tim Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -2324,23 +2324,28 @@ AC_ARG_WITH(sectok,
) )
# Check whether user wants OpenSC support # Check whether user wants OpenSC support
OPENSC_CONFIG="no"
AC_ARG_WITH(opensc, AC_ARG_WITH(opensc,
AC_HELP_STRING([--with-opensc=PFX], [--with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)],
[Enable smartcard support using OpenSC]), [
opensc_config_prefix="$withval", opensc_config_prefix="") if test "x$withval" != "xno" ; then
if test x$opensc_config_prefix != x ; then if test "x$withval" != "xyes" ; then
OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config OPENSC_CONFIG=$withval/bin/opensc-config
AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) else
if test "$OPENSC_CONFIG" != "no"; then AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` fi
LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` if test "$OPENSC_CONFIG" != "no"; then
CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
AC_DEFINE(SMARTCARD) CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
AC_DEFINE(USE_OPENSC) LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS"
SCARD_MSG="yes, using OpenSC" AC_DEFINE(SMARTCARD)
fi AC_DEFINE(USE_OPENSC)
fi SCARD_MSG="yes, using OpenSC"
fi
fi
]
)
# Check libraries needed by DNS fingerprint support # Check libraries needed by DNS fingerprint support
AC_SEARCH_LIBS(getrrsetbyname, resolv, AC_SEARCH_LIBS(getrrsetbyname, resolv,