summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-09-22 20:19:54 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-09-22 20:19:54 +1000
commit82171c66075254a6aedc0bde704b604da32c2ba4 (patch)
tree2d4ce9c7890d7067187a7d0af1b4aaf0d2d2457f
parentc373a56343f0f70ef88db1848a3888e84b18bd33 (diff)
- (dtucker) [configure.ac] Fix help for --with-opensc; patch from skeleten at
shillest.net.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ba22fb5e..b721458ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120050922 120050922
2 - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from 2 - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from
3 skeleten at shillest.net. 3 skeleten at shillest.net.
4 - (dtucker) [configure.ac] Fix help for --with-opensc; patch from skeleten at
5 shillest.net.
4 6
520050919 720050919
6 - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to 8 - (tim) [aclocal.m4 configure.ac] Delete acconfig.h and add templates to
@@ -3007,4 +3009,4 @@
3007 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3009 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3008 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3010 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3009 3011
3010$Id: ChangeLog,v 1.3892 2005/09/22 10:15:08 dtucker Exp $ 3012$Id: ChangeLog,v 1.3893 2005/09/22 10:19:54 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index ff1f87abd..ecbc07291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.295 2005/09/22 10:15:08 dtucker Exp $ 1# $Id: configure.ac,v 1.296 2005/09/22 10:19:54 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -2719,7 +2719,7 @@ AC_ARG_WITH(sectok,
2719# Check whether user wants OpenSC support 2719# Check whether user wants OpenSC support
2720OPENSC_CONFIG="no" 2720OPENSC_CONFIG="no"
2721AC_ARG_WITH(opensc, 2721AC_ARG_WITH(opensc,
2722 [--with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)], 2722 [ --with-opensc[[=PFX]] Enable smartcard support using OpenSC (optionally in PATH)],
2723 [ 2723 [
2724 if test "x$withval" != "xno" ; then 2724 if test "x$withval" != "xno" ; then
2725 if test "x$withval" != "xyes" ; then 2725 if test "x$withval" != "xyes" ; then