make bash completion directory configurable

This commit is contained in:
Frank Morgner 2018-07-11 21:55:05 +02:00
parent 1eaae6526b
commit 376de5bd4c
1 changed files with 15 additions and 3 deletions

View File

@ -269,6 +269,13 @@ AC_ARG_WITH(
[xslstylesheetsdir="detect"] [xslstylesheetsdir="detect"]
) )
AC_ARG_WITH(
[completiondir],
[AS_HELP_STRING([--with-completiondir=PATH],[Directory of Bash completion @<:@detect@:>@])],
[completiondir="${withval}"],
[completiondir="detect"]
)
AC_ARG_WITH( AC_ARG_WITH(
[pcsc-provider], [pcsc-provider],
[AS_HELP_STRING([--with-pcsc-provider=PATH],[Path to system pcsc provider @<:@system default@:>@])], [AS_HELP_STRING([--with-pcsc-provider=PATH],[Path to system pcsc provider @<:@system default@:>@])],
@ -842,9 +849,13 @@ if test "${enable_cryptotokenkit}" = "yes"; then
fi fi
AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled]) AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled])
fi fi
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
[completiondir="`pkg-config --variable=completionsdir bash-completion`"], if test "${completiondir}" = "detect"; then
[completiondir="${sysconfdir}/bash_completion.d"]) echo completion ${completiondir}
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
[completiondir="`pkg-config --variable=completionsdir bash-completion`"],
[completiondir="${sysconfdir}/bash_completion.d"])
fi
AC_SUBST([completiondir]) AC_SUBST([completiondir])
@ -1101,6 +1112,7 @@ Product URL: ${OPENSC_VS_FF_PRODUCT_URL}
User binaries: $(eval eval eval echo "${bindir}") User binaries: $(eval eval eval echo "${bindir}")
Configuration files: $(eval eval eval echo "${sysconfdir}") Configuration files: $(eval eval eval echo "${sysconfdir}")
Bash completion: ${completiondir}
XSL stylesheets: ${xslstylesheetsdir} XSL stylesheets: ${xslstylesheetsdir}
man support: ${enable_man} man support: ${enable_man}