Cleanup conventions to meet other OpenSC projects
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3438 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
500b36ae08
commit
d0e0dd2820
20
configure.ac
20
configure.ac
|
@ -180,24 +180,24 @@ AC_ARG_ENABLE(
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_WITH(
|
AC_ARG_WITH(
|
||||||
[xsl-stylesheets-dir],
|
[xsl-stylesheetsdir],
|
||||||
[AC_HELP_STRING([--with-xsl-stylesheets-dir=PATH], [docbook xsl-stylesheets for svn build @<:@detect@:>@])],
|
[AC_HELP_STRING([--with-xsl-stylesheetsdir=PATH], [docbook xsl-stylesheets for svn build @<:@detect@:>@])],
|
||||||
[xslstylesheetsdir="${withval}"],
|
[xslstylesheetsdir="${withval}"],
|
||||||
[xslstylesheetsdir="detect"]
|
[xslstylesheetsdir="detect"]
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_WITH(
|
AC_ARG_WITH(
|
||||||
[plugin-dir],
|
[plugindir],
|
||||||
[AC_HELP_STRING([--with-plugin-dir=PATH], [install Mozilla plugin to PATH @<:@LIBDIR/mozilla/plugins@:>@])],
|
[AC_HELP_STRING([--with-plugindir=PATH], [install Mozilla plugin to PATH @<:@LIBDIR/mozilla/plugins@:>@])],
|
||||||
[plugindir="${withval}"],
|
[plugindir="${withval}"],
|
||||||
[plugindir="\$(libdir)/mozilla/plugins"]
|
[plugindir="\$(libdir)/mozilla/plugins"]
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_ARG_WITH(
|
AC_ARG_WITH(
|
||||||
[pin-entry],
|
[pinentry],
|
||||||
[AC_HELP_STRING([--with-pin-entry=PROG], [run PROG as PIN-entry for OpenSC Signer @<:/usr/local/bin/gpinentry:>@])],
|
[AC_HELP_STRING([--with-pinentry=PROG], [run PROG as PIN-entry for OpenSC Signer @<:/usr/bin/gpinentry:>@])],
|
||||||
[test "${withval}" != "no" && PIN_ENTRY="${withval}"],
|
,
|
||||||
[PIN_ENTRY="/usr/local/bin/gpinentry"]
|
[with_pinentry="/usr/bin/gpinentry"]
|
||||||
)
|
)
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
|
@ -528,7 +528,7 @@ test "${enable_nsplugin}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} nsplugi
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED([OPENSC_ETC_PATH], ["${full_sysconfdir}"], [etc path for libopensc])
|
AC_DEFINE_UNQUOTED([OPENSC_ETC_PATH], ["${full_sysconfdir}"], [etc path for libopensc])
|
||||||
AC_DEFINE_UNQUOTED([OPENSC_CONF_PATH], ["${full_sysconfdir}/opensc.conf"], [default config file for libopensc])
|
AC_DEFINE_UNQUOTED([OPENSC_CONF_PATH], ["${full_sysconfdir}/opensc.conf"], [default config file for libopensc])
|
||||||
test -n "${PIN_ENTRY}" && AC_DEFINE_UNQUOTED([PIN_ENTRY], ["$PIN_ENTRY"], [PIN-entry program for OpenSC Signer])
|
test "${with_pinentry}" != "no" && AC_DEFINE_UNQUOTED([PIN_ENTRY], ["${with_pinentry}"], [PIN-entry program for OpenSC Signer])
|
||||||
AC_DEFINE_UNQUOTED([OPENSC_FEATURES], ["${OPENSC_FEATURES}"], [Enabled OpenSC features])
|
AC_DEFINE_UNQUOTED([OPENSC_FEATURES], ["${OPENSC_FEATURES}"], [Enabled OpenSC features])
|
||||||
|
|
||||||
openscincludedir="\$(includedir)/opensc"
|
openscincludedir="\$(includedir)/opensc"
|
||||||
|
@ -627,6 +627,8 @@ PC/SC support: ${enable_pcsc}
|
||||||
OpenCT support: ${enable_openct}
|
OpenCT support: ${enable_openct}
|
||||||
NSPlugin support: ${enable_nsplugin}
|
NSPlugin support: ${enable_nsplugin}
|
||||||
|
|
||||||
|
pinentry: ${with_pinentry}
|
||||||
|
|
||||||
Host: ${host}
|
Host: ${host}
|
||||||
Compiler: ${CC}
|
Compiler: ${CC}
|
||||||
Preprocessor flags: ${CPPFLAGS}
|
Preprocessor flags: ${CPPFLAGS}
|
||||||
|
|
Loading…
Reference in New Issue