diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2009-12-07 01:15:43 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2009-12-07 01:15:43 +0100 |
| commit | 1533311f4ca27adf382a158e30fbb1d2c4882a62 (patch) | |
| tree | 35bc1640b8aa906565bc13bcab0bdcb08b314919 /configure.ac | |
| parent | - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it. (diff) | |
| download | openssh-1533311f4ca27adf382a158e30fbb1d2c4882a62.tar.xz openssh-1533311f4ca27adf382a158e30fbb1d2c4882a62.zip | |
- (dtucker) Bug #1160: use pkg-config for opensc config if it's available.
Tested by Martin Paljak.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0447bd62d..88a248fb5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.430 2009/10/11 10:50:20 dtucker Exp $ +# $Id: configure.ac,v 1.431 2009/12/07 00:15:43 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.430 $) +AC_REVISION($Revision: 1.431 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -3295,11 +3295,18 @@ AC_ARG_WITH(opensc, [ --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 + AC_PATH_PROG(PKGCONFIG, pkg-config, no) + AC_MSG_CHECKING(how to get opensc config) + if test "x$withval" != "xyes" -a "x$PKGCONFIG" = "xno"; then + OPENSC_CONFIG="$withval/bin/opensc-config" + elif test -f "$withval/src/libopensc/libopensc.pc"; then + OPENSC_CONFIG="$PKGCONFIG $withval/src/libopensc/libopensc.pc" + elif test "x$PKGCONFIG" != "xno"; then + OPENSC_CONFIG="$PKGCONFIG libopensc" else - AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) + AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no) fi + AC_MSG_RESULT($OPENSC_CONFIG) if test "$OPENSC_CONFIG" != "no"; then LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` |