Attachment #52895 for bug #78730

View | Details | Raw Unified | Return to bug 78730
Collapse All | Expand All

Lines 20181-20192 Link Here

(-)openssh-3.9p1/configure (-6 / +10 lines)
20181	# Check whether --with-opensc or --without-opensc was given.	20181	# Check whether --with-opensc or --without-opensc was given.
20182	if test "${with_opensc+set}" = set; then	20182	if test "${with_opensc+set}" = set; then
20183	withval="$with_opensc"	20183	withval="$with_opensc"
20184	opensc_config_prefix="$withval"	20184
20185	else	20185	if test "x$withval" != xno ; then
20186	opensc_config_prefix=""	20186	OPENSC_CONFIG="$withval/bin/opensc-config"
20187	fi;
20188	if test x$opensc_config_prefix != x ; then
20189	OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
20190	# Extract the first word of "opensc-config", so it can be a program name with args.	20187	# Extract the first word of "opensc-config", so it can be a program name with args.
20191	set dummy opensc-config; ac_word=$2	20188	set dummy opensc-config; ac_word=$2
20192	echo "$as_me:$LINENO: checking for $ac_word" >&5	20189	echo "$as_me:$LINENO: checking for $ac_word" >&5
Lines 20241-20249 Link Here
20241	_ACEOF	20238	_ACEOF
20242		20239
20243	SCARD_MSG="yes, using OpenSC"	20240	SCARD_MSG="yes, using OpenSC"
		20241	else
		20242	{ { echo "$as_me:$LINENO: error: opensc-config not found" >&5
		20243	echo "$as_me: error: opensc-config not found" >&2;}
		20244	{ (exit 1); exit 1; }; }
20244	fi	20245	fi
20245	fi	20246	fi
20246		20247
		20248
		20249	fi;
		20250
20247	# Check libraries needed by DNS fingerprint support	20251	# Check libraries needed by DNS fingerprint support
20248	echo "$as_me:$LINENO: checking for library containing getrrsetbyname" >&5	20252	echo "$as_me:$LINENO: checking for library containing getrrsetbyname" >&5
20249	echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6	20253	echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6

Lines 2171-2179 Link Here

(-)openssh-3.9p1/configure.ac (-3 / +7 lines)
2171	AC_ARG_WITH(opensc,	2171	AC_ARG_WITH(opensc,
2172	AC_HELP_STRING([--with-opensc=PFX],	2172	AC_HELP_STRING([--with-opensc=PFX],
2173	[Enable smartcard support using OpenSC]),	2173	[Enable smartcard support using OpenSC]),
2174	opensc_config_prefix="$withval", opensc_config_prefix="")	2174	[
2175	if test x$opensc_config_prefix != x ; then	2175	if test "x$withval" != xno ; then
2176	OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config	2176	OPENSC_CONFIG="$withval/bin/opensc-config"
2177	AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)	2177	AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
2178	if test "$OPENSC_CONFIG" != "no"; then	2178	if test "$OPENSC_CONFIG" != "no"; then
2179	LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`	2179	LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
Lines 2183-2190 Link Here
2183	AC_DEFINE(SMARTCARD)	2183	AC_DEFINE(SMARTCARD)
2184	AC_DEFINE(USE_OPENSC)	2184	AC_DEFINE(USE_OPENSC)
2185	SCARD_MSG="yes, using OpenSC"	2185	SCARD_MSG="yes, using OpenSC"
		2186	else
		2187	AC_MSG_ERROR([opensc-config not found])
2186	fi	2188	fi
2187	fi	2189	fi
		2190	]
		2191	)
2188		2192
2189	# Check libraries needed by DNS fingerprint support	2193	# Check libraries needed by DNS fingerprint support
2190	AC_SEARCH_LIBS(getrrsetbyname, resolv,	2194	AC_SEARCH_LIBS(getrrsetbyname, resolv,

Return to bug 78730