|
1 In-house patch created to clear any merge conflicts from source in archive |
|
2 repo to build properly on Solaris. |
|
3 |
|
4 --- CACKey-0.7.4/configure.ac 2016-06-15 14:35:48.589770356 -0400 |
|
5 +++ CACKey-0.7.4/configure.ac 2016-06-15 14:23:15.465414402 -0400 |
|
6 @@ -1,8 +1,4 @@ |
|
7 -<<<<<<< HEAD |
|
8 -AC_INIT(cackey, 0.6.6.201207191606) |
|
9 -======= |
|
10 AC_INIT(cackey, 0.7.4) |
|
11 ->>>>>>> trunk |
|
12 AC_CONFIG_HEADERS(config.h) |
|
13 |
|
14 dnl Locate standard tools |
|
15 @@ -147,8 +143,6 @@ |
|
16 ] |
|
17 ) |
|
18 |
|
19 -<<<<<<< HEAD |
|
20 -======= |
|
21 dnl Option to enable DoD certs on hardware slot |
|
22 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]), [ |
|
23 dodcertsonhwslots=$enableval |
|
24 @@ -192,27 +186,6 @@ |
|
25 AC_DEFINE_UNQUOTED(CACKEY_PIN_COMMAND_XONLY_DEFAULT, [$pincommandxonly], [Command to run to prompt user for PIN only if DISPLAY environment variable is set]) |
|
26 fi |
|
27 |
|
28 -AC_ARG_WITH(readers-include-only, AC_HELP_STRING([--with-readers-include-only=<string>], [Specify a string to match in a reader to include it, all other readers will be excluded. The user may override this with the CACKEY_READERS_INCLUDE_ONLY environment variable.]), [ |
|
29 - readers_include_only="${withval}" |
|
30 -], [ |
|
31 - readers_include_only="no" |
|
32 -]) |
|
33 - |
|
34 -AC_ARG_WITH(readers-exclude, AC_HELP_STRING([--with-readers-exclude=<string>], [Specify a string to match in a reader to exclude it, all other readers will be included. The user may override this with the CACKEY_READERS_EXCLUDE environment variable.]), [ |
|
35 - readers_exclude="${withval}" |
|
36 -], [ |
|
37 - readers_exclude="no" |
|
38 -]) |
|
39 - |
|
40 -if ! test "${readers_include_only}" = 'no'; then |
|
41 - AC_DEFINE_UNQUOTED(CACKEY_READERS_INCLUDE_ONLY_DEFAULT, [$readers_include_only], [Substring to match to include readers]) |
|
42 -fi |
|
43 - |
|
44 -if ! test "${readers_exclude}" = 'no'; then |
|
45 - AC_DEFINE_UNQUOTED(CACKEY_READERS_EXCLUDE_DEFAULT, [$readers_exclude], [Substring to match to exclude readers]) |
|
46 -fi |
|
47 - |
|
48 ->>>>>>> trunk |
|
49 dnl Set version script, to limit the scope of symbols |
|
50 DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms) |
|
51 |