View | Details | Raw Unified | Return to bug 221 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-27 / +16 lines)
Lines 1719-1751 Link Here
1719
1719
1720
# Check whether user wants OpenSC support
1720
# Check whether user wants OpenSC support
1721
AC_ARG_WITH(opensc,
1721
AC_ARG_WITH(opensc,
1722
	[  --with-opensc           Enable smartcard support using OpenSC],
1722
	AC_HELP_STRING([--with-opensc=PFX],
1723
	[
1723
		       [Enable smartcard support using OpenSC]),
1724
		if test "x$withval" != "xno" ; then
1724
	opensc_config_prefix="$withval", opensc_config_prefix="")
1725
			if test "x$withval" != "xyes" ; then
1725
if test x$opensc_config_prefix != x ; then
1726
				CPPFLAGS="$CPPFLAGS -I${withval}"
1726
  OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
1727
				LDFLAGS="$LDFLAGS -L${withval}"
1727
  AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
1728
				if test ! -z "$need_dash_r" ; then
1728
  if test "$OPENSC_CONFIG" != "no"; then
1729
					LDFLAGS="$LDFLAGS -R${withval}"
1729
    LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
1730
				fi
1730
    LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
1731
				if test ! -z "$blibpath" ; then
1731
    CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
1732
					blibpath="$blibpath:${withval}"
1732
    LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS"
1733
				fi
1733
    AC_DEFINE(SMARTCARD)
1734
			fi
1734
    AC_DEFINE(USE_OPENSC)
1735
			AC_CHECK_HEADERS(opensc/pkcs15.h)
1735
    SCARD_MSG="yes, using OpenSC" 
1736
			if test "$ac_cv_header_opensc_pkcs15_h" != yes; then
1736
  fi
1737
				AC_MSG_ERROR(Can't find opensc/pkcs15.h)
1737
fi
1738
			fi
1739
			AC_CHECK_LIB(opensc, sc_pkcs15_bind)
1740
			if test "$ac_cv_lib_opensc_sc_pkcs15_bind" != yes; then
1741
				AC_MSG_ERROR(Can't find libopensc)
1742
			fi
1743
			AC_DEFINE(SMARTCARD)
1744
			AC_DEFINE(USE_OPENSC)
1745
			SCARD_MSG="yes, using OpenSC" 
1746
		fi
1747
	]
1748
)
1749
1738
1750
# Check whether user wants Kerberos 5 support
1739
# Check whether user wants Kerberos 5 support
1751
KRB5_MSG="no" 
1740
KRB5_MSG="no" 

Return to bug 221