Attachment 1727 Details for Bug 1160 – Use pkg-config for opensc if available.

Use pkg-config for opensc if available.

openssh-opensc-configure.patch (text/plain), 1.23 KB, created by Darren Tucker on 2009-11-20 21:18:50 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2009-11-20 21:18:50 AEDT

Size: 1.23 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /home/dtucker/openssh/cvs/openssh/configure.ac,v
>retrieving revision 1.430
>diff -u -p -r1.430 configure.ac
>--- configure.ac	11 Oct 2009 10:50:20 -0000	1.430
>+++ configure.ac	20 Nov 2009 10:04:10 -0000
>@@ -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`

Actions: View

Attachments on bug 1160: 1727