Sync with opensc-signer's configure.ac
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@142 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
59a76542d2
commit
859511f46c
45
configure.in
45
configure.in
@ -256,49 +256,6 @@ if (test ! -z "$ac_cv_commondir" && test "x$ac_cv_commondir" != "x(system)") ; t
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(LIBPCSC)
|
|
||||||
LIBPCSC="-lpcsclite"
|
|
||||||
found_pcsclite=no
|
|
||||||
saved_LIBS="$LIBS"
|
|
||||||
saved_LDFLAGS="$LDFLAGS"
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
|
||||||
AC_ARG_WITH(pcsclite,
|
|
||||||
[ --with-pcsclite=PATH use PC/SC Lite in PATH],
|
|
||||||
[
|
|
||||||
for pcscdir in /pcsc ""; do
|
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
|
||||||
LDFLAGS="$saved_LDFLAGS"
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
|
|
||||||
if test -d "$withval/lib$pcscdir"; then
|
|
||||||
if test -n "${need_dash_r}"; then
|
|
||||||
LDFLAGS="-L${withval}/lib${pcscdir}/ -R${withval}/lib${pcscdir}/ ${LDFLAGS}"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L${withval}/lib${pcscdir} ${LDFLAGS}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test -n "${need_dash_r}"; then
|
|
||||||
LDFLAGS="-L${withval}${pcscdir} -R${withval}${pcscdir} ${LDFLAGS}"
|
|
||||||
else
|
|
||||||
LDFLAGS="-L${withval}${pcscdir} ${LDFLAGS}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -d "$withval/include"; then
|
|
||||||
CPPFLAGS="-I${withval}/include${pcscdir} ${CPPFLAGS}"
|
|
||||||
else
|
|
||||||
CPPFLAGS="-I${withval}${pcscdir} ${CPPFLAGS}"
|
|
||||||
fi
|
|
||||||
AC_CHECK_LIB(pcsclite, SCardEstablishContext, found_pcsclite=yes, found_pcsclite=no)
|
|
||||||
if test "x$found_pcsclite" = "xyes" ; then
|
|
||||||
break;
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
]
|
|
||||||
)
|
|
||||||
if test "x$found_pcsclite" != "xyes" ; then
|
|
||||||
AC_CHECK_LIB(pcsclite, SCardEstablishContext, , AC_MSG_ERROR([*** PC/SC Lite missing - please install first]))
|
|
||||||
fi
|
|
||||||
LIBS="$saved_LIBS"
|
|
||||||
AM_CONDITIONAL(HAVE_PCSCLITE, test "x$found_pcsclite" = "xyes")
|
AM_CONDITIONAL(HAVE_PCSCLITE, test "x$found_pcsclite" = "xyes")
|
||||||
|
|
||||||
AC_SUBST(LIBDL)
|
AC_SUBST(LIBDL)
|
||||||
@ -477,8 +434,6 @@ if (test x$enable_debug = xyes); then
|
|||||||
AC_DEFINE(DEBUG, 1, [Enable debug messages.])
|
AC_DEFINE(DEBUG, 1, [Enable debug messages.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(CFLAGS_PCSC)
|
|
||||||
CFLAGS_PCSC=""
|
|
||||||
AC_SUBST(CFLAGS_OPENSC)
|
AC_SUBST(CFLAGS_OPENSC)
|
||||||
CFLAGS_OPENSC="-I\${top_srcdir}/src/libopensc"
|
CFLAGS_OPENSC="-I\${top_srcdir}/src/libopensc"
|
||||||
AC_SUBST(LIBOPENSC)
|
AC_SUBST(LIBOPENSC)
|
||||||
|
Loading…
Reference in New Issue
Block a user