Attachment 82 Details for Bug 221 – configure patch

[patch] configure patch

configure.patch (text/plain), 1.80 KB, created by Markus Friedl on 2002-04-18 02:21:49 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2002-04-18 02:21:49 AEST

Size: 1.80 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/openssh/configure.ac,v
>retrieving revision 1.44
>diff -u -r1.44 configure.ac
>--- configure.ac	13 Apr 2002 01:04:41 -0000	1.44
>+++ configure.ac	14 Apr 2002 18:05:47 -0000
>@@ -1719,33 +1719,22 @@
> 
> # Check whether user wants OpenSC support
> AC_ARG_WITH(opensc,
>-	[  --with-opensc           Enable smartcard support using OpenSC],
>-	[
>-		if test "x$withval" != "xno" ; then
>-			if test "x$withval" != "xyes" ; then
>-				CPPFLAGS="$CPPFLAGS -I${withval}"
>-				LDFLAGS="$LDFLAGS -L${withval}"
>-				if test ! -z "$need_dash_r" ; then
>-					LDFLAGS="$LDFLAGS -R${withval}"
>-				fi
>-				if test ! -z "$blibpath" ; then
>-					blibpath="$blibpath:${withval}"
>-				fi
>-			fi
>-			AC_CHECK_HEADERS(opensc/pkcs15.h)
>-			if test "$ac_cv_header_opensc_pkcs15_h" != yes; then
>-				AC_MSG_ERROR(Can't find opensc/pkcs15.h)
>-			fi
>-			AC_CHECK_LIB(opensc, sc_pkcs15_bind)
>-			if test "$ac_cv_lib_opensc_sc_pkcs15_bind" != yes; then
>-				AC_MSG_ERROR(Can't find libopensc)
>-			fi
>-			AC_DEFINE(SMARTCARD)
>-			AC_DEFINE(USE_OPENSC)
>-			SCARD_MSG="yes, using OpenSC" 
>-		fi
>-	]
>-)
>+	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
> 
> # Check whether user wants Kerberos 5 support
> KRB5_MSG="no"

Actions: View | Diff

Attachments on bug 221: 81 | 82 | 85