fixed dylib extensions
This commit is contained in:
parent
ef40021417
commit
c3527f4a5b
27
configure.ac
27
configure.ac
|
@ -547,7 +547,7 @@ if test "${enable_sm}" = "yes"; then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
*-mingw*|*-winnt*|*-cygwin*)
|
*-mingw*|*-winnt*|*-cygwin*)
|
||||||
DEFAULT_SM_MODULE="smm-local.dll"
|
DEFAULT_SM_MODULE="smm-local.dll"
|
||||||
DEFAULT_SM_MODULE_PATH="\# module_path = \"\";"
|
DEFAULT_SM_MODULE_PATH="\#module_path = \"\";"
|
||||||
;;
|
;;
|
||||||
*-apple-*)
|
*-apple-*)
|
||||||
DEFAULT_SM_MODULE="libsmm-local.dylib"
|
DEFAULT_SM_MODULE="libsmm-local.dylib"
|
||||||
|
@ -626,19 +626,22 @@ if test "${enable_pcsc}" = "yes"; then
|
||||||
AC_DEFINE([ENABLE_PCSC], [1], [Define if PC/SC is to be enabled])
|
AC_DEFINE([ENABLE_PCSC], [1], [Define if PC/SC is to be enabled])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(DYN_LIB_EXT)
|
||||||
|
case "${host}" in
|
||||||
|
*-mingw*|*-winnt*|*-cygwin*)
|
||||||
|
DYN_LIB_EXT=".dll"
|
||||||
|
;;
|
||||||
|
*-apple-*)
|
||||||
|
DYN_LIB_EXT=".dylib"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
DYN_LIB_EXT=".so"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
if test "${with_pkcs11_provider}" = "detect"; then
|
if test "${with_pkcs11_provider}" = "detect"; then
|
||||||
case "${host}" in
|
DEFAULT_PKCS11_PROVIDER="opensc-pkcs11${DYN_LIB_EXT}"
|
||||||
*-*-darwin*)
|
|
||||||
DEFAULT_PKCS11_PROVIDER="opensc-pkcs11.so"
|
|
||||||
;;
|
|
||||||
*-mingw*|*-winnt*|*-cygwin*)
|
|
||||||
DEFAULT_PKCS11_PROVIDER="opensc-pkcs11.dll"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
DEFAULT_PKCS11_PROVIDER="opensc-pkcs11.so"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
else
|
||||||
DEFAULT_PKCS11_PROVIDER="${with_pkcs11_provider}"
|
DEFAULT_PKCS11_PROVIDER="${with_pkcs11_provider}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -22,6 +22,7 @@ opensc.conf: opensc.conf.in force
|
||||||
-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
|
-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
|
||||||
-e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \
|
-e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \
|
||||||
-e 's|@DEFAULT_SM_MODULE_PATH[@]|$(DEFAULT_SM_MODULE_PATH)|g' \
|
-e 's|@DEFAULT_SM_MODULE_PATH[@]|$(DEFAULT_SM_MODULE_PATH)|g' \
|
||||||
|
-e 's|@DYN_LIB_EXT[@]|$(DYN_LIB_EXT)|g' \
|
||||||
-e 's|@PROFILE_DIR[@]|$(PROFILE_DIR)|g' \
|
-e 's|@PROFILE_DIR[@]|$(PROFILE_DIR)|g' \
|
||||||
-e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \
|
-e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \
|
||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
|
@ -12,7 +12,7 @@ app default {
|
||||||
# A greater value means more debug info.
|
# A greater value means more debug info.
|
||||||
# Default: 0
|
# Default: 0
|
||||||
#
|
#
|
||||||
debug = 0;
|
#debug = 3;
|
||||||
|
|
||||||
# The file to which debug output will be written
|
# The file to which debug output will be written
|
||||||
#
|
#
|
||||||
|
@ -53,7 +53,7 @@ app default {
|
||||||
|
|
||||||
# CT-API module configuration.
|
# CT-API module configuration.
|
||||||
reader_driver ctapi {
|
reader_driver ctapi {
|
||||||
# module @libdir@/libtowitoko.so {
|
# module @libdir@/libtowitoko@DYN_LIB_EXT@ {
|
||||||
# CT-API ports:
|
# CT-API ports:
|
||||||
# 0..3 COM1..4
|
# 0..3 COM1..4
|
||||||
# 4 Printer
|
# 4 Printer
|
||||||
|
@ -134,7 +134,7 @@ app default {
|
||||||
#
|
#
|
||||||
# card_driver customcos {
|
# card_driver customcos {
|
||||||
# The location of the driver library
|
# The location of the driver library
|
||||||
# module = @libdir@/card_customcos.so;
|
# module = @libdir@/card_customcos@DYN_LIB_EXT@;
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Force using specific card driver
|
# Force using specific card driver
|
||||||
|
@ -504,7 +504,7 @@ app default {
|
||||||
#
|
#
|
||||||
# emulate custom {
|
# emulate custom {
|
||||||
# The location of the driver library
|
# The location of the driver library
|
||||||
# module = @libdir@/p15emu_custom.so;
|
# module = @libdir@/p15emu_custom@DYN_LIB_EXT@;
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# some additional application parameters:
|
# some additional application parameters:
|
||||||
|
|
|
@ -55,14 +55,9 @@ install-exec-hook:
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
# see http://wiki.cacert.org/wiki/Pkcs11TaskForce
|
# see http://wiki.cacert.org/wiki/Pkcs11TaskForce
|
||||||
if CYGWIN
|
|
||||||
PKCS11_SUFFIX=.dll
|
|
||||||
else
|
|
||||||
PKCS11_SUFFIX=.so
|
|
||||||
endif
|
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
|
$(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
|
||||||
for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
|
for l in opensc-pkcs11$(DYN_LIB_EXT) onepin-opensc-pkcs11$(DYN_LIB_EXT) pkcs11-spy$(DYN_LIB_EXT); do \
|
||||||
rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
||||||
$(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
$(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue