summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorSamuel Lidén Borell <samuel@slbdata.se>2011-06-18 15:05:28 +0200
committerSamuel Lidén Borell <samuel@slbdata.se>2011-06-18 15:05:28 +0200
commit818400cd7662635afe7cd93ac706fb218d4c3b92 (patch)
tree4e6394d916484a20ff1e446e57d46c843e28d867 /configure
parentf70f583102cdd0a26761209f6b95de8963b7d28a (diff)
downloadfribid-818400cd7662635afe7cd93ac706fb218d4c3b92.tar.gz
fribid-818400cd7662635afe7cd93ac706fb218d4c3b92.tar.bz2
fribid-818400cd7662635afe7cd93ac706fb218d4c3b92.zip
Rename "pkcs11 engine" to "pkcs11 module"
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure b/configure
index ae010a2..17370f6 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ Options:
--plugin-path=PATH Sets the NPAPI plugin path [$pluginPaths]
This option may be repeated if you want to create
plugin links in several places.
- --pkcs11-engine=PATH Path to PKCS#11 module [$pkcs11Module]
+ --pkcs11-module=PATH Path to PKCS#11 module [$pkcs11Module]
--disable-pkcs11 Disable building PKCS#11 smartcard support
--enable-pkcs11 Force building PKCS#11 smartcard support
--optional-pkcs11 Detect PKCS#11 module availability at runtime
@@ -104,7 +104,11 @@ Options:
pluginPaths="$pluginPaths $path"
fi
;;
+ --pkcs11-module=*)
+ pkcs11Module=${flag#--pkcs11-module=}
+ ;;
--pkcs11-engine=*)
+ # Deprecated alias for --pkcs11-module
pkcs11Module=${flag#--pkcs11-engine=}
;;
--disable-pkcs11)
@@ -276,7 +280,7 @@ cat <<EOT >"$CONFFILE"
#define NPAPI_PLUGIN_PATHS "$pluginPaths"
-#define DEFAULT_PKCS11_ENGINE "$pkcs11Module"
+#define DEFAULT_PKCS11_MODULE "$pkcs11Module"
#define ENABLE_PKCS11 ${enable_pkcs11:-0}
#define OPTIONAL_PKCS11 ${optional_pkcs11:-0}