Diff

Differences From Artifact [0e5526103b]:

To Artifact [34fbe03317]:


   156    156   
   157    157   dnl Option to hard-code a command to run to request a PIN (enabling protected authentication path)
   158    158   AC_ARG_WITH(pin-command, AC_HELP_STRING([--with-pin-command=<command>], [Specify a command to run to request a PIN from the user.  The user may override this with the CACKEY_PIN_COMMAND environment variable.]), [
   159    159   	pincommand="${withval}"
   160    160   ], [
   161    161   	pincommand="no"
   162    162   ])
          163  +
          164  +AC_ARG_WITH(pin-command-x, AC_HELP_STRING([--with-pin-command-x=<command>], [Same as --with-pin-command, but only sets Protected Authentication Path if the DISPLAY environment variable is set]), [
          165  +	pincommandxonly="${withval}"
          166  +], [
          167  +	pincommandxonly="no"
          168  +])
   163    169   
   164    170   if ! test "${pincommand}" = 'no'; then
   165    171   	AC_DEFINE_UNQUOTED(CACKEY_PIN_COMMAND_DEFAULT, [$pincommand], [Command to run to prompt user for PIN])
   166    172   fi
          173  +
          174  +if ! test "${pincommandxonly}" = 'no'; then
          175  +	AC_DEFINE_UNQUOTED(CACKEY_PIN_COMMAND_XONLY_DEFAULT, [$pincommandxonly], [Command to run to prompt user for PIN only if DISPLAY environment variable is set])
          176  +fi
   167    177   
   168    178   dnl Set version script, to limit the scope of symbols
   169    179   DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
   170    180   
   171    181   dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
   172    182   DC_SYNC_RPATH
   173    183   
   174    184   dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
   175    185   DC_SYNC_SHLIBOBJS
   176    186   
   177    187   dnl Produce Makefile
   178    188   AC_OUTPUT(Makefile libcackey.syms)