Check-in [ba2bf716e9]
Overview
Comment:Updated test for --enable-dod-certs-on-hw-slots configure option
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dodcerts-on-seperate-slot
Files: files | file ages | folders
SHA1:ba2bf716e922504d6eb84466bf9d3552f5941282
User & Date: rkeene on 2012-07-21 06:54:52
Other Links: manifest | tags
Context
2012-07-21
06:55
Updated Mac OS X build to use --enable-dod-certs-on-hw-slots, which is needed for its Tokend check-in: 3dd0313cab user: rkeene tags: dodcerts-on-seperate-slot
06:54
Updated test for --enable-dod-certs-on-hw-slots configure option check-in: ba2bf716e9 user: rkeene tags: dodcerts-on-seperate-slot
06:50
Updated to allow the user to specify (via environment variables) whether or not to include the DoD certificates on the hardware slot tokens check-in: b957a3fa2e user: rkeene tags: dodcerts-on-seperate-slot
Changes

Modified configure.ac from [86141e7a07] to [34ff5a91b6].

   141    141   
   142    142   		AC_MSG_FAILURE([simple PC/SC program failed])
   143    143   	]
   144    144   )
   145    145   
   146    146   dnl Option to enable DoD certs on hardware slot
   147    147   AC_ARG_ENABLE(dod-certs-on-hw-slots, AC_HELP_STRING([--enable-dod-certs-on-hw-slots], [Specify that DoD certificates should be made available on hardware token slots]), [
   148         -	AC_DEFINE(CACKEY_CARD_SLOT_INCLUDE_EXTRA_CERTS, [1], [Specify that DoD certificates should be made available on hardware token slots])
          148  +	dodcertsonhwslots=$enableval
          149  +], [
          150  +	dodcertsonhwslots=no
   149    151   ])
          152  +
          153  +if ! test "${dodcertsonhwslots}" = 'no'; then
          154  +	AC_DEFINE(CACKEY_CARD_SLOT_INCLUDE_EXTRA_CERTS, [1], [Specify that DoD certificates should be made available on hardware token slots])
          155  +fi
   150    156   
   151    157   dnl Set version script, to limit the scope of symbols
   152    158   DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
   153    159   
   154    160   dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
   155    161   DC_SYNC_RPATH
   156    162   
   157    163   dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
   158    164   DC_SYNC_SHLIBOBJS
   159    165   
   160    166   dnl Produce Makefile
   161    167   AC_OUTPUT(Makefile libcackey.syms)