giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix LIBPCSCLITE 

Rename COMPILE_PAM conditional to HAVE_PAM
Remove lex check from configure.ac


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@95 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2001-12-22 22:55:40 +00:00
parent 3775b18c81
commit 468a7e3daf
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap
View File

@ -6,6 +6,6 @@ rm -f *.cache *.status *.log *.m4
cat aclocal/*.m4 > acinclude.m4
aclocal
libtoolize --copy --force --automake
autoheader configure.in > config.h.in
autoheader
automake --add-missing --copy --force
autoreconf --gnu

10
configure.in
View File

@ -118,7 +118,6 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_LEX
dnl Special check for pthread support.
ACX_PTHREAD(
@ -255,6 +254,7 @@ if (test ! -z "$ac_cv_commondir" && test "x$ac_cv_commondir" != "x(system)") ; t
fi
AC_SUBST(LIBPCSCLITE)
LIBPCSCLITE="-lpcsclite"
saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS"
saved_CPPFLAGS="$CPPFLAGS"
@ -284,16 +284,14 @@ AC_ARG_WITH(pcsclite,
else
CPPFLAGS="-I${withval}${pcscdir} ${CPPFLAGS}"
fi
AC_CHECK_LIB(pcsclite, SCardEstablishContext, [LIBPCSCLITE="$LIBPCSCLITE -lpcsclite"])
AC_CHECK_LIB(pcsclite, SCardEstablishContext)
if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes" ; then
break;
fi
done
]
)
if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xno" ; then
AC_CHECK_LIB(pcsclite, SCardEstablishContext, [LIBPCSCLITE="$LIBPCSCLITE -lpcsclite"])
fi
AC_CHECK_LIB(pcsclite, SCardEstablishContext, , AC_MSG_ERROR([*** PC/SC Lite missing - please install first]))
AM_CONDITIONAL(HAVE_PCSCLITE, test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes")
AC_SUBST(LIBDL)
@ -462,7 +460,7 @@ if test "x$PAM_MSG" = "xyes" ; then
)
fi
LIBS="$saved_LIBS"
AM_CONDITIONAL(COMPILE_PAM, test "x$PAM_MSG" = "xyes")
AM_CONDITIONAL(HAVE_PAM, test "x$PAM_MSG" = "xyes")
dnl Enable/disable debugging messages.
AC_ARG_ENABLE(debug,

4
src/pam/Makefile.am
View File

@ -9,7 +9,7 @@ LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ @LIBCRYPTO@ \
SRC = pam_pkcs15.c
INC =
if COMPILE_PAM
if HAVE_PAM
lib_LTLIBRARIES = libpam_pkcs15.la
noinst_PROGRAMS = pam_pkcs15-test
else
@ -23,7 +23,7 @@ libpam_pkcs15_la_LDFLAGS = -module
pam_pkcs15_test_SOURCES = $(SRC) $(INC)
pam_pkcs15_test_CFLAGS = -DTEST
if COMPILE_PAM
if HAVE_PAM
install-exec-local: install-libLTLIBRARIES
@$(NORMAL_INSTALL)