projects
/
pam_pcsc_cr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename test chalresp
[pam_pcsc_cr.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index d4b556238e625f22a6ce346446de0868146a414a..4a9453d3126a62d7d791a95250141dbb4155a532 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-9,7
+9,7
@@
AC_LANG_C
AC_PROG_CC
if test "X$CC" = "Xgcc"; then
AC_PROG_CC
if test "X$CC" = "Xgcc"; then
- CFLAGS="$CFLAGS -Wall
-g
"
+ CFLAGS="$CFLAGS -Wall"
fi
AC_PROG_MAKE_SET
fi
AC_PROG_MAKE_SET
@@
-47,7
+47,10
@@
AS_IF([test "x$OPENSSL_CFLAGS" != "x" -o "x$OPENSSL_LIBS" != "x" ], [
CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS"
LIBS="$OPENSSL_LIBS $LIBS"
CPPFLAGS="$OPENSSL_CFLAGS $CPPFLAGS"
LIBS="$OPENSSL_LIBS $LIBS"
-AS_IF([test "x$use_openssl" != "xyes"], [
+AC_ARG_ENABLE(tomcrypt,
+ [ --enable-tomcrypt use libtomcrypt even when openssl present])
+
+AS_IF([test "x$use_openssl" != "xyes" -o "x$enable_tomcrypt" = "xyes"], [
PKG_CHECK_MODULES([TOMCRYPT], [libtomcrypt], [], [:])
])
AC_ARG_WITH(libtomcrypt-include-path,
PKG_CHECK_MODULES([TOMCRYPT], [libtomcrypt], [], [:])
])
AC_ARG_WITH(libtomcrypt-include-path,
@@
-69,10
+72,12
@@
AS_IF([test "x$use_openssl" != "xyes" -a "x$use_tomcrypt" != "xyes"], [
])
AS_IF([test "x$use_openssl" = "xyes"], [
])
AS_IF([test "x$use_openssl" = "xyes"], [
- CRYPTO_OBJS+=ossl_crypto.lo
+ CRYPTO_OBJS+=" ossl_crypto.lo"
+ AC_DEFINE([HAVE_OPENSSL], [1], [Use openssl libcrypto])
])
AS_IF([test "x$use_tomcrypt" = "xyes"], [
])
AS_IF([test "x$use_tomcrypt" = "xyes"], [
- CRYPTO_OBJS+=tom_crypto.lo
+ CRYPTO_OBJS+=" tom_crypto.lo"
+ AC_DEFINE([HAVE_TOMCRYPT], [1], [Use libtomcrypt])
])
AC_SUBST(CRYPTO_OBJS)
])
AC_SUBST(CRYPTO_OBJS)