diff options
| author | Tim Rice <tim@multitalents.net> | 2005-03-17 13:37:04 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2005-03-17 13:37:04 -0800 |
| commit | 12ee8e241eb38308be8c1e4dd57ac7d8c02f3297 (patch) | |
| tree | ce241c67181ab8a0df75cbebf72f61a709b4d595 | |
| parent | c3939e22fdcc9c22102b8d3d894f5885105a1a04 (diff) | |
- (tim) [configure.ac] Bug 998. Make path for --with-opensc optional.
Make --without-opensc work.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 39 |
2 files changed, 27 insertions, 18 deletions
@@ -1,3 +1,7 @@ +20050317 + - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. + Make --without-opensc work. + 20050314 - (dtucker) OpenBSD CVS Sync - dtucker@cvs.openbsd.org 2005/03/10 10:15:02 @@ -2364,4 +2368,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ diff --git a/configure.ac b/configure.ac index e48028b7..c2309477 100644 --- a/configure.ac +++ b/configure.ac @@ -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 # @@ -2324,23 +2324,28 @@ AC_ARG_WITH(sectok, ) # Check whether user wants OpenSC support +OPENSC_CONFIG="no" AC_ARG_WITH(opensc, - AC_HELP_STRING([--with-opensc=PFX], - [Enable smartcard support using OpenSC]), - opensc_config_prefix="$withval", opensc_config_prefix="") -if test x$opensc_config_prefix != x ; then - OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config - AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) - if test "$OPENSC_CONFIG" != "no"; then - LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` - LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` - CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" - LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" - AC_DEFINE(SMARTCARD) - AC_DEFINE(USE_OPENSC) - SCARD_MSG="yes, using OpenSC" - fi -fi + [--with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)], + [ + if test "x$withval" != "xno" ; then + if test "x$withval" != "xyes" ; then + OPENSC_CONFIG=$withval/bin/opensc-config + else + AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) + fi + if test "$OPENSC_CONFIG" != "no"; then + LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` + LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` + CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" + LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" + AC_DEFINE(SMARTCARD) + AC_DEFINE(USE_OPENSC) + SCARD_MSG="yes, using OpenSC" + fi + fi + ] +) # Check libraries needed by DNS fingerprint support AC_SEARCH_LIBS(getrrsetbyname, resolv, |