Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Imported Upstream version 0.12.0

  • Loading branch information...
commit 5d4629e9ed599aad2b00ef4768f5dcd90ee1df7b 1 parent 1320f99
@marschap authored
Showing with 7,729 additions and 21,452 deletions.
  1. +5,923 −290 {doc/nonpersistent → }/ChangeLog
  2. +15 −4 Makefile.am
  3. +35 −36 Makefile.in
  4. +1 −1  Makefile.mak
  5. +45 −21 NEWS
  6. +2 −37 README
  7. +34 −35 aclocal.m4
  8. +71 −130 config.guess
  9. +20 −20 config.h.in
  10. +43 −15 config.sub
  11. +809 −1,077 configure
  12. +87 −222 configure.ac
  13. +14 −74 doc/Makefile.am
  14. +110 −427 doc/Makefile.in
  15. +0 −10 doc/README
  16. 0  doc/{api → }/api.css
  17. +0 −18 doc/api/api.xml
  18. +0 −20 doc/api/apps/chapter.xml
  19. +0 −43 doc/api/apps/sc_enum_apps.xml
  20. +0 −50 doc/api/apps/sc_find_app_by_aid.xml
  21. +0 −47 doc/api/apps/sc_find_pkcs15_app.xml
  22. +0 −34 doc/api/apps/sc_free_apps.xml
  23. +0 −47 doc/api/apps/sc_update_dir.xml
  24. +0 −31 doc/api/asn1/chapter.xml
  25. +0 −62 doc/api/asn1/sc_asn1_decode.xml
  26. +0 −48 doc/api/asn1/sc_asn1_encode.xml
  27. +0 −44 doc/api/asn1/sc_asn1_find_tag.xml
  28. +0 −33 doc/api/asn1/sc_asn1_print_tags.xml
  29. +0 −48 doc/api/asn1/sc_asn1_put_tag.xml
  30. +0 −44 doc/api/asn1/sc_asn1_read_tag.xml
  31. +0 −42 doc/api/asn1/sc_asn1_skip_tag.xml
  32. +0 −34 doc/api/asn1/sc_asn1_verify_tag.xml
  33. +0 −36 doc/api/asn1/sc_copy_asn1_entry.xml
  34. +0 −36 doc/api/asn1/sc_format_asn1_entry.xml
  35. +0 −31 doc/api/card/chapter.xml
  36. +0 −46 doc/api/card/sc_card_ctl.xml
  37. +0 −49 doc/api/card/sc_check_sw.xml
  38. +0 −38 doc/api/card/sc_format_apdu.xml
  39. +0 −41 doc/api/card/sc_get_challenge.xml
  40. +0 −48 doc/api/card/sc_get_data.xml
  41. +0 −41 doc/api/card/sc_lock.xml
  42. +0 −49 doc/api/card/sc_put_data.xml
  43. +0 −40 doc/api/card/sc_transmit_apdu.xml
  44. +0 −40 doc/api/card/sc_unlock.xml
  45. +0 −71 doc/api/card/sc_wait_for_event.xml
  46. +0 −40 doc/api/file/chapter.xml
  47. +0 −45 doc/api/file/sc_append_record.xml
  48. +0 −34 doc/api/file/sc_create_file.xml
  49. +0 −40 doc/api/file/sc_delete_file.xml
  50. +0 −42 doc/api/file/sc_delete_record.xml
  51. +0 −37 doc/api/file/sc_file_dup.xml
  52. +0 −35 doc/api/file/sc_file_free.xml
  53. +0 −34 doc/api/file/sc_file_new.xml
  54. +0 −42 doc/api/file/sc_list_files.xml
  55. +0 −54 doc/api/file/sc_read_binary.xml
  56. +0 −54 doc/api/file/sc_read_record.xml
  57. +0 −55 doc/api/file/sc_select_file.xml
  58. +0 −56 doc/api/file/sc_update_binary.xml
  59. +0 −56 doc/api/file/sc_update_record.xml
  60. +0 −56 doc/api/file/sc_write_binary.xml
  61. +0 −57 doc/api/file/sc_write_record.xml
  62. +0 −26 doc/api/init/chapter.xml
  63. +0 −41 doc/api/init/sc_card_valid.xml
  64. +0 −50 doc/api/init/sc_connect_card.xml
  65. +0 −43 doc/api/init/sc_detect_card_presence.xml
  66. +0 −47 doc/api/init/sc_disconnect_card.xml
  67. +0 −85 doc/api/init/sc_establish_context.xml
  68. +0 −40 doc/api/init/sc_get_cache_dir.xml
  69. +0 −41 doc/api/init/sc_make_cache_dir.xml
  70. +0 −41 doc/api/init/sc_release_context.xml
  71. +0 −66 doc/api/init/sc_set_card_driver.xml
  72. +0 −11 doc/api/misc/chapter.xml
  73. +0 −23 doc/api/types/chapter.xml
  74. +0 −97 doc/api/types/sc_app_info_t.xml
  75. +0 −72 doc/api/types/sc_asn1_entry.xml
  76. +0 −73 doc/api/types/sc_card_t.xml
  77. +0 −98 doc/api/types/sc_file_t.xml
  78. +0 −83 doc/api/types/sc_path_t.xml
  79. +0 −21 doc/api/util/chapter.xml
  80. +0 −42 doc/api/util/sc_base64_decode.xml
  81. +0 −49 doc/api/util/sc_base64_encode.xml
  82. +0 −32 doc/api/util/sc_der_clear.xml
  83. +0 −33 doc/api/util/sc_der_copy.xml
  84. +0 −33 doc/api/util/sc_strerror.xml
  85. +0 −981 doc/html.out/api.html
  86. +0 −633 doc/html.out/tools.html
  87. 0  doc/{api → }/html.xsl
  88. +0 −74 doc/man.out/cardos-tool.1
  89. +0 −120 doc/man.out/cryptoflex-tool.1
  90. +0 −148 doc/man.out/netkey-tool.1
  91. +0 −73 doc/man.out/opensc-config.1
  92. +0 −165 doc/man.out/opensc-explorer.1
  93. +0 −89 doc/man.out/opensc-tool.1
  94. +0 −208 doc/man.out/pkcs11-tool.1
  95. +0 −123 doc/man.out/pkcs15-crypt.1
  96. +0 −288 doc/man.out/pkcs15-init.1
  97. +0 −46 doc/man.out/pkcs15-profile.5
  98. +0 −122 doc/man.out/pkcs15-tool.1
  99. +0 −92 doc/man.out/sc_app_info_t.3
  100. +0 −54 doc/man.out/sc_append_record.3
  101. +0 −82 doc/man.out/sc_asn1_decode.3
  102. +0 −54 doc/man.out/sc_asn1_encode.3
  103. +0 −73 doc/man.out/sc_asn1_entry.3
  104. +0 −53 doc/man.out/sc_asn1_find_tag.3
  105. +0 −44 doc/man.out/sc_asn1_print_tags.3
  106. +0 −58 doc/man.out/sc_asn1_put_tag.3
  107. +0 −52 doc/man.out/sc_asn1_read_tag.3
  108. +0 −47 doc/man.out/sc_asn1_skip_tag.3
  109. +0 −46 doc/man.out/sc_asn1_verify_tag.3
  110. +0 −51 doc/man.out/sc_base64_decode.3
  111. +0 −61 doc/man.out/sc_base64_encode.3
  112. +0 −51 doc/man.out/sc_card_ctl.3
  113. +0 −80 doc/man.out/sc_card_t.3
  114. +0 −51 doc/man.out/sc_card_valid.3
  115. +0 −58 doc/man.out/sc_check_sw.3
  116. +0 −55 doc/man.out/sc_connect_card.3
  117. +0 −50 doc/man.out/sc_copy_asn1_entry.3
  118. +0 −47 doc/man.out/sc_create_file.3
  119. +0 −48 doc/man.out/sc_delete_file.3
  120. +0 −48 doc/man.out/sc_delete_record.3
  121. +0 −43 doc/man.out/sc_der_clear.3
  122. +0 −45 doc/man.out/sc_der_copy.3
  123. +0 −48 doc/man.out/sc_detect_card_presence.3
  124. +0 −52 doc/man.out/sc_disconnect_card.3
  125. +0 −49 doc/man.out/sc_enum_apps.3
  126. +0 −106 doc/man.out/sc_establish_context.3
  127. +0 −47 doc/man.out/sc_file_dup.3
  128. +0 −43 doc/man.out/sc_file_free.3
  129. +0 −43 doc/man.out/sc_file_new.3
  130. +0 −112 doc/man.out/sc_file_t.3
  131. +0 −58 doc/man.out/sc_find_app_by_aid.3
  132. +0 −52 doc/man.out/sc_find_pkcs15_app.3
  133. +0 −52 doc/man.out/sc_format_apdu.3
  134. +0 −48 doc/man.out/sc_format_asn1_entry.3
  135. +0 −44 doc/man.out/sc_free_apps.3
  136. +0 −48 doc/man.out/sc_get_cache_dir.3
  137. +0 −49 doc/man.out/sc_get_challenge.3
  138. +0 −54 doc/man.out/sc_get_data.3
  139. +0 −49 doc/man.out/sc_list_files.3
  140. +0 −45 doc/man.out/sc_lock.3
  141. +0 −45 doc/man.out/sc_make_cache_dir.3
  142. +0 −54 doc/man.out/sc_put_data.3
  143. +0 −61 doc/man.out/sc_read_binary.3
  144. +0 −64 doc/man.out/sc_read_record.3
  145. +0 −48 doc/man.out/sc_release_context.3
  146. +0 −61 doc/man.out/sc_select_file.3
  147. +0 −92 doc/man.out/sc_set_card_driver.3
  148. +0 −43 doc/man.out/sc_strerror.3
  149. +0 −48 doc/man.out/sc_transmit_apdu.3
  150. +0 −46 doc/man.out/sc_unlock.3
  151. +0 −63 doc/man.out/sc_update_binary.3
  152. +0 −52 doc/man.out/sc_update_dir.3
  153. +0 −67 doc/man.out/sc_update_record.3
  154. +0 −74 doc/man.out/sc_wait_for_event.3
  155. +0 −64 doc/man.out/sc_write_binary.3
  156. +0 −69 doc/man.out/sc_write_record.3
  157. +0 −130 doc/man.out/westcos-tool.1
  158. 0  doc/{api → }/man.xsl
  159. +0 −59 doc/nonpersistent/Makefile.am
  160. +0 −514 doc/nonpersistent/Makefile.in
  161. +0 −72 doc/nonpersistent/export-wiki.sh
  162. +0 −58 doc/nonpersistent/export-wiki.xsl
  163. +0 −37 doc/nonpersistent/wiki.out/AKIS.html
  164. +0 −32 doc/nonpersistent/wiki.out/ASEPCOS.html
  165. +0 −44 doc/nonpersistent/wiki.out/AktivRutokenECP.html
  166. +0 −32 doc/nonpersistent/wiki.out/AktivRutokenS.html
  167. +0 −154 doc/nonpersistent/wiki.out/AladdinEtokenPro.html
  168. +0 −21 doc/nonpersistent/wiki.out/AppleCSP.html
  169. +0 −27 doc/nonpersistent/wiki.out/Australia.html
  170. +0 −47 doc/nonpersistent/wiki.out/AustrianEid.html
  171. +0 −201 doc/nonpersistent/wiki.out/AuthorsAndCredits.html
  172. +0 −35 doc/nonpersistent/wiki.out/BelgianEid.html
  173. +0 −36 doc/nonpersistent/wiki.out/CardOs.html
  174. +0 −65 doc/nonpersistent/wiki.out/CardReaders_CTAPI.html
  175. +0 −54 doc/nonpersistent/wiki.out/CardReaders_SPR532.html
  176. +0 −60 doc/nonpersistent/wiki.out/CompatibilityIssues.html
  177. +0 −13 doc/nonpersistent/wiki.out/CompatiblityIssues.html
  178. +0 −191 doc/nonpersistent/wiki.out/CompilingInstalling.html
  179. +0 −23 doc/nonpersistent/wiki.out/CryptoIdentity.html
  180. +0 −130 doc/nonpersistent/wiki.out/CryptoIdentityItsec.html
  181. +0 −33 doc/nonpersistent/wiki.out/Cryptoflex.html
  182. +0 −173 doc/nonpersistent/wiki.out/Cyberflex.html
  183. +0 −50 doc/nonpersistent/wiki.out/DesignDiscussion.html
  184. +0 −31 doc/nonpersistent/wiki.out/DesignDiscussion_UserInterface.html
  185. +0 −47 doc/nonpersistent/wiki.out/DeveloperHardware.html
  186. +0 −56 doc/nonpersistent/wiki.out/DevelopmentPolicy.html
  187. +0 −20 doc/nonpersistent/wiki.out/EMV.html
  188. +0 −21 doc/nonpersistent/wiki.out/Emv.html
  189. +0 −54 doc/nonpersistent/wiki.out/EnvironmentVariables.html
  190. +0 −113 doc/nonpersistent/wiki.out/EstonianEid.html
  191. +0 −40 doc/nonpersistent/wiki.out/FTCOSPK01C.html
  192. +0 −48 doc/nonpersistent/wiki.out/FeiTian.html
  193. +0 −67 doc/nonpersistent/wiki.out/FinnishEid.html
  194. +0 −335 doc/nonpersistent/wiki.out/FrequentlyAskedQuestions.html
  195. +0 −26 doc/nonpersistent/wiki.out/GemplusGpk.html
  196. +0 −30 doc/nonpersistent/wiki.out/GermanApi.html
  197. +0 −47 doc/nonpersistent/wiki.out/GermanEGK.html
  198. +0 −133 doc/nonpersistent/wiki.out/GermanEid.html
  199. +0 −27 doc/nonpersistent/wiki.out/HBCI.html
  200. +0 −37 doc/nonpersistent/wiki.out/IbmJcop.html
  201. +0 −47 doc/nonpersistent/wiki.out/ItalianCNS.html
  202. +0 −22 doc/nonpersistent/wiki.out/ItalianEid.html
  203. +0 −26 doc/nonpersistent/wiki.out/ItalianPostecert.html
  204. +0 −46 doc/nonpersistent/wiki.out/JavaCard.html
  205. +0 −48 doc/nonpersistent/wiki.out/LinuxDistributions.html
  206. +0 −35 doc/nonpersistent/wiki.out/MacOSX.html
  207. +0 −73 doc/nonpersistent/wiki.out/MacOsX.html
  208. +0 −17 doc/nonpersistent/wiki.out/MacOsXTokend.html
  209. +0 −52 doc/nonpersistent/wiki.out/MailingLists.html
  210. +0 −26 doc/nonpersistent/wiki.out/Micardo.html
  211. +0 −89 doc/nonpersistent/wiki.out/MiniDriver.html
  212. +0 −37 doc/nonpersistent/wiki.out/MoreDocumentation.html
  213. +0 −37 doc/nonpersistent/wiki.out/Mozilla.html
  214. +0 −176 doc/nonpersistent/wiki.out/MozillaSteps.html
  215. +0 −117 doc/nonpersistent/wiki.out/MyEID.html
  216. +0 −39 doc/nonpersistent/wiki.out/OberThur.html
  217. +0 −32 doc/nonpersistent/wiki.out/OpenPgp.html
  218. +0 −32 doc/nonpersistent/wiki.out/OpenSSL.html
  219. +0 −42 doc/nonpersistent/wiki.out/OperatingSystems.html
  220. +0 −154 doc/nonpersistent/wiki.out/OverView.html
  221. +0 −25 doc/nonpersistent/wiki.out/PGP.html
  222. +0 −79 doc/nonpersistent/wiki.out/PKCS11.html
  223. +0 −19 doc/nonpersistent/wiki.out/PKCSCSPDesc.html
  224. +0 −39 doc/nonpersistent/wiki.out/PKI.html
  225. +0 −40 doc/nonpersistent/wiki.out/PageTemplates.html
  226. +0 −33 doc/nonpersistent/wiki.out/PamModules.html
  227. +0 −17 doc/nonpersistent/wiki.out/PinHandling.html
  228. +0 −94 doc/nonpersistent/wiki.out/PinpadReaders.html
  229. +0 −236 doc/nonpersistent/wiki.out/PivTool.html
  230. +0 −443 doc/nonpersistent/wiki.out/Pkcs15Init.html
  231. +0 −23 doc/nonpersistent/wiki.out/PortugeseEid.html
  232. +0 −35 doc/nonpersistent/wiki.out/PortugueseEid.html
  233. +0 −16 doc/nonpersistent/wiki.out/PrimeCard.html
  234. +0 −287 doc/nonpersistent/wiki.out/PuTTYcard.html
  235. +0 −257 doc/nonpersistent/wiki.out/QuickStart.html
  236. +0 −23 doc/nonpersistent/wiki.out/RainbowIkeyFour.html
  237. +0 −33 doc/nonpersistent/wiki.out/RainbowIkeyThree.html
  238. +0 −265 doc/nonpersistent/wiki.out/RecentTestresults.html
  239. +0 −43 doc/nonpersistent/wiki.out/ReleaseHowto.html
  240. +0 −33 doc/nonpersistent/wiki.out/ReleaseTodo.html
  241. +0 −82 doc/nonpersistent/wiki.out/ReplacingCertificates.html
  242. +0 −60 doc/nonpersistent/wiki.out/ResourcesLinks.html
  243. +0 −31 doc/nonpersistent/wiki.out/RoadMap.html
  244. +0 −21 doc/nonpersistent/wiki.out/SchlumbergerEgate.html
  245. +0 −19 doc/nonpersistent/wiki.out/Seccos.html
  246. +0 −67 doc/nonpersistent/wiki.out/SecureSetup.html
  247. +0 −129 doc/nonpersistent/wiki.out/SecureShell.html
  248. +0 −24 doc/nonpersistent/wiki.out/SetCos.html
  249. +0 −40 doc/nonpersistent/wiki.out/Sign.html
  250. +0 −19 doc/nonpersistent/wiki.out/SmartCardApplications.html
  251. +0 −24 doc/nonpersistent/wiki.out/SpanishEid.html
  252. +0 −54 doc/nonpersistent/wiki.out/SslChoice.html
  253. +0 −37 doc/nonpersistent/wiki.out/StarKey.html
  254. +0 −22 doc/nonpersistent/wiki.out/StarSign.html
  255. +0 −45 doc/nonpersistent/wiki.out/Starcos.html
  256. +0 −69 doc/nonpersistent/wiki.out/SubversionRepository.html
  257. +0 −33 doc/nonpersistent/wiki.out/SwedishEid.html
  258. +0 −242 doc/nonpersistent/wiki.out/TCOS.html
  259. +0 −25 doc/nonpersistent/wiki.out/TaiwanEid.html
  260. +0 −33 doc/nonpersistent/wiki.out/Tools.html
  261. +0 −82 doc/nonpersistent/wiki.out/TroubleShooting.html
  262. +0 −13 doc/nonpersistent/wiki.out/TurkishEid.html
  263. +0 −129 doc/nonpersistent/wiki.out/UnitedStatesPIV.html
  264. +0 −62 doc/nonpersistent/wiki.out/UsingOpensc.html
  265. +0 −29 doc/nonpersistent/wiki.out/VPN.html
  266. +0 −73 doc/nonpersistent/wiki.out/WPA.html
  267. +0 −73 doc/nonpersistent/wiki.out/WhatsNew.html
  268. +0 −84 doc/nonpersistent/wiki.out/WindowsCSP.html
  269. +0 −24 doc/nonpersistent/wiki.out/XML.html
  270. +0 −47 doc/nonpersistent/wiki.out/e-gate.html
  271. +0 −37 doc/nonpersistent/wiki.out/ePass3000.html
  272. +0 −164 doc/nonpersistent/wiki.out/index.html
  273. +0 −35 doc/nonpersistent/wiki.out/pkcs11_keypair_gen.html
  274. +0 −576 doc/nonpersistent/wiki.out/trac.css
  275. 0  doc/{nonpersistent → }/svn2cl.xsl
  276. +2 −2 doc/tools/cardos-tool.xml
  277. +0 −79 doc/tools/opensc-config.xml
  278. +131 −20 doc/tools/opensc-explorer.xml
  279. +13 −4 doc/tools/opensc-tool.xml
  280. +4 −2 doc/tools/pkcs11-tool.xml
  281. +40 −14 doc/tools/pkcs15-init.xml
  282. +29 −4 doc/tools/pkcs15-tool.xml
  283. +0 −1  doc/tools/tools.xml
  284. +61 −28 doc/tools/westcos-tool.xml
  285. +9 −20 etc/Makefile.in
  286. +157 −100 etc/opensc.conf.in
  287. +4 −4 ltmain.sh
  288. +0 −160 m4/libassuan.m4
  289. +7 −6 m4/libtool.m4
  290. +5 −5 m4/ltversion.m4
  291. +0 −1  packaged
  292. +2 −2 solaris/Makefile
  293. +0 −1  solaris/proto
  294. +2 −2 src/Makefile.am
  295. +13 −24 src/Makefile.in
  296. +12 −2 src/Makefile.mak
  297. +29 −0 src/cardmod/Makefile.am
Sorry, we could not display the entire diff because too many files (581) changed.
View
6,213 doc/nonpersistent/ChangeLog → ChangeLog
5,923 additions, 290 deletions not shown
View
19 Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = foreign 1.10
ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = \
@@ -22,6 +21,18 @@ dist_noinst_DATA = README \
solaris/opensc.conf-dist solaris/pkginfo.in solaris/proto
dist_doc_DATA = NEWS
-# Allow detection of packaged tarball
-dist-hook:
- echo > "$(distdir)/packaged"
+Generate-ChangeLog:
+ rm -f ChangeLog.tmp "$(srcdir)/ChangeLog"
+ test -n "$(SVN)" -a -n "$(XSLTPROC)"
+ if test -d "$(top_srcdir)/.svn"; then \
+ $(SVN) --verbose --xml log "$(top_srcdir)" | \
+ $(XSLTPROC) --nonet --stringparam linelen 75 \
+ --stringparam groupbyday no \
+ --stringparam include-rev no \
+ "$(top_srcdir)/doc/svn2cl.xsl" - > ChangeLog.tmp; \
+ else \
+ echo "Warning: Unable to generate ChangeLog from none svn checkout" >&2; \
+ echo > ChangeLog.tmp; \
+ fi
+ mv ChangeLog.tmp "$(srcdir)/ChangeLog"
+ ( cd "$(srcdir)" && autoreconf -ivf )
View
71 Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39,14 +39,14 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(dist_noinst_DATA) $(dist_noinst_SCRIPTS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure COPYING NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing
+ $(srcdir)/config.h.in $(top_srcdir)/configure COPYING \
+ ChangeLog NEWS config.guess config.sub depcomp install-sh \
+ ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/libassuan.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -159,8 +159,6 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
-ICONV_CFLAGS = @ICONV_CFLAGS@
-ICONV_LIBS = @ICONV_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -168,10 +166,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
-LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
-LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
LIBOBJS = @LIBOBJS@
+LIBRARY_BITNESS = @LIBRARY_BITNESS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
@@ -196,8 +192,6 @@ OPENSC_VERSION_MAJOR = @OPENSC_VERSION_MAJOR@
OPENSC_VERSION_MINOR = @OPENSC_VERSION_MINOR@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
-OPTIONAL_ICONV_CFLAGS = @OPTIONAL_ICONV_CFLAGS@
-OPTIONAL_ICONV_LIBS = @OPTIONAL_ICONV_LIBS@
OPTIONAL_OPENCT_CFLAGS = @OPTIONAL_OPENCT_CFLAGS@
OPTIONAL_OPENCT_LIBS = @OPTIONAL_OPENCT_LIBS@
OPTIONAL_OPENSSL_CFLAGS = @OPTIONAL_OPENSSL_CFLAGS@
@@ -220,6 +214,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCSC_CFLAGS = @PCSC_CFLAGS@
PCSC_LIBS = @PCSC_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -232,10 +228,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
SVN = @SVN@
-TR = @TR@
VERSION = @VERSION@
-WGET = @WGET@
-WGET_OPTS = @WGET_OPTS@
WIN_LIBPREFIX = @WIN_LIBPREFIX@
XSLTPROC = @XSLTPROC@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
@@ -281,11 +274,8 @@ lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-openscincludedir = @openscincludedir@
pdfdir = @pdfdir@
pkcs11dir = @pkcs11dir@
-pkgconfigdir = @pkgconfigdir@
-plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -298,7 +288,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
xslstylesheetsdir = @xslstylesheetsdir@
-AUTOMAKE_OPTIONS = foreign 1.10
ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = \
config.log config.status \
@@ -412,7 +401,7 @@ uninstall-dist_docDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -437,7 +426,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -600,11 +589,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -648,17 +635,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -827,8 +814,8 @@ uninstall-am: uninstall-dist_docDATA
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
@@ -842,9 +829,21 @@ uninstall-am: uninstall-dist_docDATA
uninstall uninstall-am uninstall-dist_docDATA
-# Allow detection of packaged tarball
-dist-hook:
- echo > "$(distdir)/packaged"
+Generate-ChangeLog:
+ rm -f ChangeLog.tmp "$(srcdir)/ChangeLog"
+ test -n "$(SVN)" -a -n "$(XSLTPROC)"
+ if test -d "$(top_srcdir)/.svn"; then \
+ $(SVN) --verbose --xml log "$(top_srcdir)" | \
+ $(XSLTPROC) --nonet --stringparam linelen 75 \
+ --stringparam groupbyday no \
+ --stringparam include-rev no \
+ "$(top_srcdir)/doc/svn2cl.xsl" - > ChangeLog.tmp; \
+ else \
+ echo "Warning: Unable to generate ChangeLog from none svn checkout" >&2; \
+ echo > ChangeLog.tmp; \
+ fi
+ mv ChangeLog.tmp "$(srcdir)/ChangeLog"
+ ( cd "$(srcdir)" && autoreconf -ivf )
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
View
2  Makefile.mak
@@ -1,5 +1,5 @@
-SUBDIRS = src
+SUBDIRS = win32 src
all::
View
66 NEWS
@@ -1,31 +1,55 @@
NEWS for OpenSC -- History of user visible changes
-Please also see doc/WhatsNew.html or
-http://www.opensc-project.org/opensc/wiki/WhatsNew
-
-Also see the svn changelog using svn command
-or doc/nonpersistent/ChangeLog.
-
-New in 0.11.13; 2010-02-16; Andreas Jellinghaus
+Complete change history is available online:
+http://www.opensc-project.org/opensc/timeline
+
+New in 0.12.0; 2010-12-22
+* OpenSC uses a single reader driver, specified at compile time.
+* New card driver: Italian eID (CNS) by Emanuele Pucciarelli.
+* New card driver: Portuguese eID by João Poupino.
+* New card driver: westcos by François Leblanc.
+* pkcs11-tool can use a slot based on ID, label or index in the slot list.
+* PIN flags are updated from supported cards when C_GetTokenInfo is called.
+* Support for CardOS 4.4 cards added.
+* Fature to exclude readers from OpenSC PKCS#11 via "ignored_readers"
+ configuration file entry.
+* #229: Support semi-automatic fixes to cards personalized with older and
+ broken OpenSC versions.
+* Software keys removed from pkcs15-init and the PKCS#11 module. OpenSC
+ can either generate keys on card or import plaintext keys to the card, but
+ will never generate plaintext key material in software by itself.
+ All traces of a software token (PKCS#15 Section 7) shall be removed.
+* Updates to PC/SC driver to build with pcsc-lite >= 1.6.2
+* Build script for a binary Mac OS X installer for 10.5 and 10.6 systems.
+ Binary installer includes OpenSC.tokend for platform integration.
+ 10.6 installer includes engine_pkcs11.
* Modify Rutoken S binary interfaces by Aktiv Co.
-* Muscle driver fixed (acl reading issue)
-* Many small fixes (e.g. mem leaks)
-* Compiling with openssl 1.0.0-beta fixed
-
+* Support GOST R 34.10-2001 and GOST R 34.11-94 by Aktiv Co.
+* CardOS driver now emulates sign on rsa keys with sign+decrypt usage
+ with padding and decrypt(). This is compatible with old cards and
+ card initialized by Siemens software. Removed "--split-key" option,
+ as it is no longer needed.
+* Improved debugging support: debug level 3 will show everything
+ except of ASN1 and card matching debugging (usualy not needed).
+* Massive changes to libopensc. This library is now internal, only
+ used by opensc-pkcs11.so and command line tools. Header files are
+ no longer installed, library should not be used by other applications.
+ Please use generic PKCS#11 interface instead.
+* #include file statements cleaned up: first include "config.h", then
+ system headers, then additional libraries, then headers in opensc
+ (but from other directories), then header files from same directory.
+ Fix path to reference headers, remove src/include/ directory.
+* Various source code fixes and improvements.
+* OpenSC now depends on xsltproc utility and docbook-xsl to build docs and man
+* Remove iconv dependency. EstEID driver now uses the commonName from the
+ certificate for card label.
+* Possibility to change the default behavior for card resets via
+ opensc.conf.
+
New in 0.11.12; 2009-12-18; Andreas Jellinghaus
* Document integer problem in OpenSC and implement workaround
* Improve entersafe profile to support private data objects
-New in 0.11.11; 2009-10-26; Andreas Jellinghaus
-* Now again compatible with OpenSSL 0.9.7 and OpenSSL 1.0.0
-* A few warnings and minor bugs were fixed
-* Updated myeid driver by Aventra
-
-New in 0.11.10; 2009-10-20; Andreas Jellinghaus
-* New westcos driver by François Leblanc
-* Initial support for MyEid card (Aventra)
-* GOST algorithm supported by Rutoken driver (Aleksey Samsonov)
-
New in 0.11.9; 2009-07-29; Andreas Jellinghaus
* New rutoken_ecp driver by Aktiv Co. / Aleksey Samsonov
* Allow more keys/certificates/files etc. with entersafe tokens
View
39 README
@@ -1,39 +1,4 @@
-OpenSC documentation is now maintained in our online wiki at
+OpenSC documentation wiki is available online at
http://www.opensc-project.org/opensc/
-and a copy in html format is provided in the doc/ directory
-with all releases or snapshots of OpenSC in tar.gz files.
-Please take a look at the documentation before trying to
-install OpenSC. Most important are the pages
-
- OverView
-A short introduction what OpenSC is and how it fits into the big picture.
-
- WhatsNew
-What is new, what has changed since the last major release?
-Also see this section for a list of incompatibilities.
-
-Short list: libopensc is now version 2.0.0, i.e. you need to
-recompile applications using opensc. And all libraries and
-the opensc-pkcs11.so module moved from lib/pkcs11/ or lib/opensc/
-to simply lib/. That fixes a number of problems, but you might
-need to change some configuration.
-
- OperatingSystems
-What your operating system needs to have for OpenSC to work.
-
- CompilingInstalling
-How to compile and install OpenSC yourself.
-
- QuickStart
-installation and basic steps to initialize a blank smart card.
-
- UsingOpensc
-options when using OpenSC.
-
-
-Also check the specific pages of the smart cards or crypto tokens you want
-to use. If you have any trouble the MailingLists page will tell you how
-to contact us for help.
-
-Regards, the OpenSC Team.
+Please take a look at the documentation before trying to use OpenSC.
View
69 aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,13 +13,14 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
@@ -47,7 +48,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -60,7 +64,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -69,34 +72,31 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,16 +138,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -155,25 +156,24 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
@@ -192,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -208,7 +208,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1108,7 +1108,6 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/acx_pthread.m4])
-m4_include([m4/libassuan.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
View
201 config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
+timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-04-27'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +56,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -656,7 +660,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -807,12 +811,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -822,6 +826,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +858,20 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +894,17 @@ EOF
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -882,78 +914,34 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +950,11 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +977,6 @@ EOF
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1005,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1182,7 +1113,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1206,16 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
View
40 config.h.in
@@ -6,8 +6,11 @@
/* Default PC/SC provider */
#undef DEFAULT_PCSC_PROVIDER
-/* Use iconv libraries and header files */
-#undef ENABLE_ICONV
+/* Enable cardmod support */
+#undef ENABLE_CARDMOD
+
+/* Enable CT-API support */
+#undef ENABLE_CTAPI
/* Have OpenCT libraries and header files */
#undef ENABLE_OPENCT
@@ -42,21 +45,18 @@
/* Define to 1 if you have the `getopt_long' function. */
#undef HAVE_GETOPT_LONG
+/* Define to 1 if you have the `getopt_long_only' function. */
+#undef HAVE_GETOPT_LONG_ONLY
+
/* Define to 1 if you have the `getpass' function. */
#undef HAVE_GETPASS
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
-/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -75,12 +75,6 @@
/* Define to 1 if you have the <readline/readline.h> header file. */
#undef HAVE_READLINE_READLINE_H
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `setutent' function. */
-#undef HAVE_SETUTENT
-
/* Define to 1 if `stat' has the bug that it succeeds when given the
zero-length file name argument. */
#undef HAVE_STAT_EMPTY_STRING_BUG
@@ -103,9 +97,15 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
@@ -124,9 +124,6 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
-/* Define to 1 if you have the `vsyslog' function. */
-#undef HAVE_VSYSLOG
-
/* Define to 1 if you have the <winscard.h> header file. */
#undef HAVE_WINSCARD_H
@@ -141,6 +138,9 @@
*/
#undef LT_OBJDIR
+/* Define to 1 if assertions should be disabled. */
+#undef NDEBUG
+
/* Enabled OpenSC features */
#undef OPENSC_FEATURES
@@ -174,13 +174,13 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* PIN-entry program for OpenSC Signer */
-#undef PIN_ENTRY
-
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
View
58 config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
+timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-04-17'
# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,10 +153,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -281,6 +288,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -288,13 +296,14 @@ case $basic_machine in
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -337,7 +346,7 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -365,15 +374,17 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
+ | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile-* | tilegx-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +478,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -719,6 +734,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1069,6 +1087,11 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
+ # This must be matched before tile*.
+ tilegx*)
+ basic_machine=tilegx-unknown
+ os=-linux-gnu
+ ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
@@ -1240,6 +1263,9 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1260,9 +1286,9 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1309,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1416,6 +1442,8 @@ case $os in
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1613,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
View
1,886 configure
809 additions, 1,077 deletions not shown
View
309 configure.ac
@@ -3,15 +3,15 @@ dnl -*- mode: m4; -*-
AC_PREREQ(2.60)
define([PACKAGE_VERSION_MAJOR], [0])
-define([PACKAGE_VERSION_MINOR], [11])
-define([PACKAGE_VERSION_FIX], [13])
+define([PACKAGE_VERSION_MINOR], [12])
+define([PACKAGE_VERSION_FIX], [0])
define([PACKAGE_SUFFIX], [])
AC_INIT([opensc],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+AM_INIT_AUTOMAKE(foreign 1.10)
OPENSC_VERSION_MAJOR="PACKAGE_VERSION_MAJOR"
OPENSC_VERSION_MINOR="PACKAGE_VERSION_MINOR"
@@ -21,8 +21,8 @@ OPENSC_VERSION_FIX="PACKAGE_VERSION_FIX"
# (Code changed: REVISION++)
# (Oldest interface removed: OLDEST++)
# (Interfaces added: CURRENT++, REVISION=0)
-OPENSC_LT_CURRENT="2"
-OPENSC_LT_OLDEST="2"
+OPENSC_LT_CURRENT="3"
+OPENSC_LT_OLDEST="3"
OPENSC_LT_REVISION="0"
OPENSC_LT_AGE="0"
OPENSC_LT_AGE="$((${OPENSC_LT_CURRENT}-${OPENSC_LT_OLDEST}))"
@@ -34,14 +34,6 @@ AC_PROG_CC
PKG_PROG_PKG_CONFIG
AC_C_BIGENDIAN
-AC_MSG_CHECKING([svn checkout])
-if test -e "${srcdir}/packaged"; then
- svn_checkout="no"
-else
- svn_checkout="yes"
-fi
-AC_MSG_RESULT([${svn_checkout}])
-
AC_ARG_WITH(
[cygwin-native],
[AS_HELP_STRING([--with-cygwin-native],[compile native win32])],
@@ -53,32 +45,9 @@ dnl Check for some target-specific stuff
test -z "${WIN32}" && WIN32="no"
test -z "${CYGWIN}" && CYGWIN="no"
case "${host}" in
- *-*-hpux*)
- CPPFLAGS="${CPPFLAGS} -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
- ;;
*-*-solaris*)
CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
LDFLAGS="${LDFLAGS} -L/usr/local/lib -R/usr/local/lib"
- need_dash_r="1"
- ;;
- *-*-sunos4*)
- CPPFLAGS="${CPPFLAGS} -DSUNOS4"
- ;;
- *-*-aix*)
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
- LDFLAGS="${LDFLAGS} -L/usr/local/lib"
- if test "${LD}" != "gcc" -a -z "${blibpath}"; then
- blibpath="/usr/lib:/lib:/usr/local/lib"
- fi
- ;;
- *-*-osf*)
- CPPFLAGS="${CPPFLAGS} -D_POSIX_PII_SOCKET"
- ;;
- *-*-darwin*)
- LIBS="${LIBS} -Wl,-framework,CoreFoundation"
- if test "${GCC}" = "yes"; then
- CFLAGS="${CFLAGS} -no-cpp-precomp"
- fi
;;
*-mingw*|*-winnt*)
WIN32="yes"
@@ -131,13 +100,6 @@ AC_ARG_ENABLE(
)
AC_ARG_ENABLE(
- [iconv],
- [AS_HELP_STRING([--enable-iconv],[enable iconv linkage @<:@detect@:>@])],
- ,
- [enable_iconv="detect"]
-)
-
-AC_ARG_ENABLE(
[openssl],
[AS_HELP_STRING([--enable-openssl],[enable openssl linkage @<:@detect@:>@])],
,
@@ -153,29 +115,30 @@ AC_ARG_ENABLE(
AC_ARG_ENABLE(
[pcsc],
- [AS_HELP_STRING([--enable-pcsc],[enable pcsc support @<:@disabled@:>@])],
+ [AS_HELP_STRING([--disable-pcsc],[disable pcsc support @<:@enabled@:>@])],
,
- [enable_pcsc="no"]
+ [enable_pcsc="yes"]
)
AC_ARG_ENABLE(
- [nsplugin],
- [AS_HELP_STRING([--enable-nsplugin],[enable nsplugin (signer) @<:@disabled@:>@])],
+ [ctapi],
+ [AS_HELP_STRING([--enable-ctapi],[enable CT-API support @<:@disabled@:>@])],
,
- [enable_nsplugin="no"]
+ [enable_ctapi="no"]
+)
+
+AC_ARG_ENABLE(
+ [cardmod],
+ [AS_HELP_STRING([--enable-cardmod],[enable cardmod module on Windows @<:@disabled@:>@])],
+ ,
+ [enable_cardmod="no"]
)
AC_ARG_ENABLE(
[man],
[AS_HELP_STRING([--disable-man],[disable installation of manuals @<:@enabled for none Windows@:>@])],
,
- [
- if test "${WIN32}" = "yes"; then
- enable_man="no"
- else
- enable_man="yes"
- fi
- ]
+ [enable_man="detect"]
)
AC_ARG_ENABLE(
@@ -193,26 +156,20 @@ AC_ARG_WITH(
)
AC_ARG_WITH(
- [plugindir],
- [AS_HELP_STRING([--with-plugindir=PATH],[install Mozilla plugin to PATH @<:@LIBDIR/mozilla/plugins@:>@])],
- [plugindir="${withval}"],
- [plugindir="\$(libdir)/mozilla/plugins"]
-)
-
-AC_ARG_WITH(
[pcsc-provider],
[AS_HELP_STRING([--with-pcsc-provider=PATH],[Path to system pcsc provider @<:@system default@:>@])],
,
[with_pcsc_provider="detect"]
)
-
-AC_ARG_WITH(
- [pinentry],
- [AS_HELP_STRING([--with-pinentry=PROG],[run PROG as PIN-entry for OpenSC Signer @<:/usr/bin/gpinentry:>@])],
- ,
- [with_pinentry="/usr/bin/gpinentry"]
-)
-
+dnl ./configure check
+reader_count=""
+for rdriver in "${enable_pcsc}" "${enable_openct}" "${enable_ctapi}"; do
+ test "${rdriver}" = "yes" && reader_count="${reader_count}x"
+done
+if test "${reader_count}" != "x"; then
+ AC_MSG_ERROR([Only one of --enable-pcsc, --enable-openct, --enable-ctapi can be specified!])
+fi
+
dnl Checks for programs.
AC_PROG_CPP
AC_PROG_INSTALL
@@ -236,60 +193,27 @@ ifdef(
)
dnl These required for svn checkout
-AC_ARG_VAR([XSLTPROC], [xsltproc utility])
AC_ARG_VAR([SVN], [subversion utility])
-AC_ARG_VAR([WGET], [wget utility])
-AC_ARG_VAR([WGET_OPTS], [wget options])
-AC_ARG_VAR([TR], [tr utility])
-AC_CHECK_PROGS([XSLTPROC],[xsltproc])
+AC_ARG_VAR([XSLTPROC], [xsltproc utility])
AC_CHECK_PROGS([SVN],[svn])
-AC_CHECK_PROGS([WGET],[wget])
-AC_CHECK_PROGS([TR],[tr])
-test -z "${WGET_OPTS}" && WGET_OPTS="-nv"
+AC_CHECK_PROGS([XSLTPROC],[xsltproc])
+AC_MSG_CHECKING([xsl-stylesheets])
if test "${xslstylesheetsdir}" = "detect"; then
- AC_MSG_CHECKING([xsl-stylesheets])
xslstylesheetsdir="no"
for f in \
/usr/share/xml/docbook/stylesheet/nwalsh \
+ /usr/share/xml/docbook/stylesheet/nwalsh/current \
+ /opt/local/share/xsl/docbook-xsl \
+ /sw/share/xml/xsl/docbook-xsl \
/usr/share/sgml/docbook/*; do
test -e "${f}/html/docbook.xsl" && xslstylesheetsdir="${f}"
done
- AC_MSG_RESULT([${xslstylesheetsdir}])
elif test "${xslstylesheetsdir}" != "no"; then
- AC_MSG_CHECKING([xsl-stylesheets])
test -e "${xslstylesheetsdir}/html/docbook.xsl" || AC_MSG_ERROR([invalid])
fi
-
-dnl svn checkout dependencies
-if test "${svn_checkout}" = "yes"; then
- AC_MSG_CHECKING([XSLTPROC requirement])
- if test -n "${XSLTPROC}"; then
- AC_MSG_RESULT([ok])
- else
- if test "${enable_man}" = "yes" -o "${enable_doc}" = "yes"; then
- AC_MSG_ERROR([Missing XSLTPROC svn build with man or doc])
- else
- AC_MSG_WARN(["make dist" will not work])
- fi
- fi
-
- if test "${enable_man}" = "yes"; then
- test "${xslstylesheetsdir}" = "no" && AC_MSG_ERROR([xsl-stylesheets are required for svn build with man])
- fi
-
- AC_MSG_CHECKING([svn doc build dependencies])
- if test -n "${SVN}" -a -n "${TR}" -a -n "${WGET}"; then
- AC_MSG_RESULT([ok])
- else
- if test "${enable_doc}" = "yes"; then
- AC_MSG_ERROR([Missing SVN, TR or WGET for svn doc build])
- else
- AC_MSG_WARN(["make dist" will not work])
- fi
- fi
-fi
+AC_MSG_RESULT([${xslstylesheetsdir}])
dnl C Compiler features
AC_C_INLINE
@@ -297,10 +221,11 @@ AC_C_INLINE
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
+AC_HEADER_ASSERT
AC_CHECK_HEADERS([ \
errno.h fcntl.h malloc.h stdlib.h \
inttypes.h string.h strings.h \
- sys/time.h unistd.h locale.h getopt.h
+ sys/time.h unistd.h getopt.h sys/mman.h
])
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -315,10 +240,15 @@ AC_FUNC_STAT
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([ \
getpass gettimeofday memset mkdir \
- strdup strerror setutent vsyslog \
- setlocale getopt_long \
- strlcpy
+ strdup strerror getopt_long getopt_long_only \
+ strlcpy strlcat
])
+AC_CHECK_SIZEOF(void *)
+if test "${ac_cv_sizeof_void_p}" = 8; then
+ LIBRARY_BITNESS="64"
+else
+ LIBRARY_BITNESS="32"
+fi
dnl See if socket() is found from libsocket
AC_CHECK_LIB(
@@ -366,6 +296,16 @@ if test "${WIN32}" = "no"; then
CC="${PTHREAD_CC}"
fi
+if test "${enable_cardmod}" = "yes"; then
+ dnl win32 special test for minidriver
+ AC_CHECK_HEADER(
+ [cardmod.h],
+ ,
+ [AC_MSG_ERROR([cardmod.h is not found and required for cardmod])]
+ )
+ AC_DEFINE([ENABLE_CARDMOD], [1], [Enable cardmod support])
+fi
+
AC_ARG_VAR([ZLIB_CFLAGS], [C compiler flags for zlib])
AC_ARG_VAR([ZLIB_LIBS], [linker flags for zlib])
if test -z "${ZLIB_LIBS}"; then
@@ -444,66 +384,6 @@ if test "${enable_readline}" = "yes"; then
fi
fi
-AC_ARG_VAR([ICONV_CFLAGS], [C compiler flags for iconv])
-AC_ARG_VAR([ICONV_LIBS], [linker flags for iconv])
-if test -n "${ICONV_LIBS}"; then
- ac_cv_lib_iconv="yes"
-else
- AC_MSG_CHECKING([if iconv library available within libc])
- AC_LINK_IFELSE(
- [AC_LANG_FUNC_LINK_TRY([iconv])],
- [
- AC_MSG_RESULT([yes])
- ac_cv_lib_iconv="yes"
- ],
- [
- AC_MSG_RESULT([no])
- AC_CHECK_LIB(
- [iconv],
- [iconv],
- [
- ac_cv_lib_iconv="yes"
- ICONV_LIBS="-liconv"
- ],
- [AC_CHECK_LIB(
- [iconv],
- [libiconv],
- [
- ac_cv_lib_iconv="yes"
- ICONV_LIBS="-liconv"
- ]
- )]
- )
- ]
- )
-fi
-saved_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} ${ICONV_CFLAGS}"
-AC_CHECK_HEADERS([iconv.h])
-CFLAGS="${saved_CFLAGS}"
-test "${ac_cv_lib_iconv}" = "yes" -a "${ac_cv_header_iconv_h}" = "yes" && have_iconv="yes"
-
-case "${enable_iconv}" in
- no)
- have_iconv="no"
- ;;
- detect)
- if test "${have_iconv}" = "yes"; then
- enable_iconv="yes"
- else
- enable_iconv="no"
- fi
- ;;
-esac
-
-if test "${enable_iconv}" = "yes"; then
- if test "${have_iconv}" = "yes"; then
- AC_DEFINE([ENABLE_ICONV], [1], [Use iconv libraries and header files])
- else
- AC_MSG_ERROR([iconv linkage required, but no iconv was found])
- fi
-fi
-
PKG_CHECK_MODULES(
[OPENSSL],
[libcrypto >= 0.9.7],
@@ -554,6 +434,10 @@ if test "${enable_openct}" = "yes"; then
)
fi
+if test "${enable_ctapi}" = "yes"; then
+ AC_DEFINE([ENABLE_CTAPI], [1], [Enable CT-API support])
+fi
+
if test "${enable_pcsc}" = "yes"; then
if test "${WIN32}" != "yes"; then
PKG_CHECK_EXISTS(
@@ -587,7 +471,7 @@ if test "${enable_pcsc}" = "yes"; then
DEFAULT_PCSC_PROVIDER="winscard.dll"
;;
*)
- DEFAULT_PCSC_PROVIDER="/usr/lib${libdir##*/lib}/libpcsclite.so.1"
+ DEFAULT_PCSC_PROVIDER="libpcsclite.so.1"
;;
esac
else
@@ -597,21 +481,23 @@ if test "${enable_pcsc}" = "yes"; then
AC_DEFINE([ENABLE_PCSC], [1], [Define if PC/SC is to be enabled])
fi
-dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
-AM_PATH_LIBASSUAN(
- ,
- [have_assuan="yes"],
- [have_assuan="no"]
-)
-
-if test "${enable_nsplugin}" = "yes"; then
- if test "x${have_assuan}" != "xyes" -o "x${have_openssl}" != "xyes"; then
- AC_MSG_ERROR([nsplugin requires assuan and openssl])
+if test "${enable_man}" = "detect"; then
+ if test "${WIN32}" = "yes"; then
+ enable_man="no"
+ elif test -n "${XSLTPROC}" -a "${xslstylesheetsdir}" != "no"; then
+ enable_man="yes"
+ else
+ enable_man="no"
fi
fi
+if test "${enable_man}" = "yes" -o "${enable_doc}" = "yes"; then
+ AC_MSG_CHECKING([XSLTPROC requirement])
+ test -n "${XSLTPROC}" || AC_MSG_ERROR([Missing XSLTPROC svn build with man or doc])
+ test "${xslstylesheetsdir}" != "no" || AC_MSG_ERROR([Missing xslstylesheetsdir])
+ AC_MSG_RESULT([ok])
+fi
+
OPENSC_FEATURES=""
if test "${enable_zlib}" = "yes"; then
OPENSC_FEATURES="${OPENSC_FEATURES} zlib"
@@ -623,11 +509,6 @@ if test "${enable_readline}" = "yes"; then
OPTIONAL_READLINE_CFLAGS="${READLINE_CFLAGS}"
OPTIONAL_READLINE_LIBS="${READLINE_LIBS}"
fi
-if test "${enable_iconv}" = "yes"; then
- OPENSC_FEATURES="${OPENSC_FEATURES} iconv"
- OPTIONAL_ICONV_CFLAGS="${ICONV_CFLAGS}"
- OPTIONAL_ICONV_LIBS="${ICONV_LIBS}"
-fi
if test "${enable_openssl}" = "yes"; then
OPENSC_FEATURES="${OPENSC_FEATURES} openssl"
OPTIONAL_OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
@@ -642,22 +523,21 @@ if test "${enable_pcsc}" = "yes"; then
OPENSC_FEATURES="${OPENSC_FEATURES} pcsc(${DEFAULT_PCSC_PROVIDER})"
OPTIONAL_PCSC_CFLAGS="${PCSC_CFLAGS}"
fi
-test "${enable_nsplugin}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} nsplugin"
+if test "${enable_ctapi}" = "yes"; then
+ OPENSC_FEATURES="${OPENSC_FEATURES} ctapi"
+fi
+if test "${enable_cardmod}" = "yes"; then
+ OPENSC_FEATURES="${OPENSC_FEATURES} cardmod"
+fi
AC_DEFINE_UNQUOTED([OPENSC_VERSION_MAJOR], [${OPENSC_VERSION_MAJOR}], [OpenSC version major component])
AC_DEFINE_UNQUOTED([OPENSC_VERSION_MINOR], [${OPENSC_VERSION_MINOR}], [OpenSC version minor component])
AC_DEFINE_UNQUOTED([OPENSC_VERSION_FIX], [${OPENSC_VERSION_FIX}], [OpenSC version fix component])
-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])
-openscincludedir="\$(includedir)/opensc"
pkcs11dir="\$(libdir)/pkcs11"
-pkgconfigdir="\$(libdir)/pkgconfig"
-AC_SUBST([openscincludedir])
AC_SUBST([pkcs11dir])
-AC_SUBST([plugindir])
-AC_SUBST([pkgconfigdir])
AC_SUBST([xslstylesheetsdir])
AC_SUBST([OPENSC_VERSION_MAJOR])
AC_SUBST([OPENSC_VERSION_MINOR])
@@ -672,25 +552,22 @@ AC_SUBST([OPTIONAL_ZLIB_CFLAGS])
AC_SUBST([OPTIONAL_ZLIB_LIBS])
AC_SUBST([OPTIONAL_READLINE_CFLAGS])
AC_SUBST([OPTIONAL_READLINE_LIBS])
-AC_SUBST([OPTIONAL_ICONV_CFLAGS])
-AC_SUBST([OPTIONAL_ICONV_LIBS])
AC_SUBST([OPTIONAL_OPENSSL_CFLAGS])
AC_SUBST([OPTIONAL_OPENSSL_LIBS])
AC_SUBST([OPTIONAL_OPENCT_CFLAGS])
AC_SUBST([OPTIONAL_OPENCT_LIBS])
AC_SUBST([OPTIONAL_PCSC_CFLAGS])
+AC_SUBST([LIBRARY_BITNESS])
-AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])
AM_CONDITIONAL([ENABLE_MAN], [test "${enable_man}" = "yes"])
AM_CONDITIONAL([ENABLE_ZLIB], [test "${enable_zlib}" = "yes"])
AM_CONDITIONAL([ENABLE_READLINE], [test "${enable_readline}" = "yes"])
-AM_CONDITIONAL([ENABLE_ICONV], [test "${enable_iconv}" = "yes"])
AM_CONDITIONAL([ENABLE_OPENSSL], [test "${enable_openssl}" = "yes"])
AM_CONDITIONAL([ENABLE_OPENCT], [test "${enable_openct}" = "yes"])
-AM_CONDITIONAL([ENABLE_NSPLUGIN], [test "${enable_nsplugin}" = "yes"])
AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"])
AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
+AM_CONDITIONAL([ENABLE_CARDMOD], [test "${enable_cardmod}" = "yes"])
if test "${enable_pedantic}" = "yes"; then
enable_strict="yes";
@@ -707,29 +584,22 @@ fi
AC_CONFIG_FILES([
Makefile
doc/Makefile
- doc/nonpersistent/Makefile
etc/Makefile
src/Makefile
src/common/Makefile
- src/include/Makefile
- src/include/winconfig.h
- src/include/opensc/Makefile
src/libopensc/Makefile
- src/libopensc/opensc-config
src/libopensc/libopensc.pc
- src/libopensc/libpkcs15init.pc
- src/libopensc/libscconf.pc
- src/openssh/Makefile
src/pkcs11/Makefile
src/pkcs15init/Makefile
src/scconf/Makefile
- src/signer/Makefile
- src/signer/npinclude/Makefile
src/tests/Makefile
src/tests/regression/Makefile
src/tools/Makefile
+ src/cardmod/Makefile
+ src/cardmod/cardmod.inf
win32/Makefile
- win32/versioninfo.rc.in
+ win32/versioninfo.rc
+ win32/winconfig.h
])
AC_OUTPUT
@@ -747,14 +617,13 @@ man support: ${enable_man}
doc support: ${enable_doc}
zlib support: ${enable_zlib}
readline support: ${enable_readline}
-iconv support: ${enable_iconv}
OpenSSL support: ${enable_openssl}
PC/SC support: ${enable_pcsc}
OpenCT support: ${enable_openct}
-NSPlugin support: ${enable_nsplugin}
+CT-API support: ${enable_ctapi}
+cardmod support: ${enable_cardmod}
PC/SC default provider: ${DEFAULT_PCSC_PROVIDER}
-pinentry: ${with_pinentry}
Host: ${host}
Compiler: ${CC}
@@ -769,15 +638,11 @@ READLINE_CFLAGS: ${READLINE_CFLAGS}
READLINE_LIBS: ${READLINE_LIBS}
ZLIB_CFLAGS: ${ZLIB_CFLAGS}
ZLIB_LIBS: ${ZLIB_LIBS}
-ICONV_CFLAGS: ${ICONV_CFLAGS}
-ICONV_LIBS: ${ICONV_LIBS}
OPENSSL_CFLAGS: ${OPENSSL_CFLAGS}
OPENSSL_LIBS: ${OPENSSL_LIBS}
OPENCT_CFLAGS: ${OPENCT_CFLAGS}
OPENCT_LIBS: ${OPENCT_LIBS}
PCSC_CFLAGS: ${PCSC_CFLAGS}
-LIBASSUAN_CFLAGS: ${LIBASSUAN_CFLAGS}
-LIBASSUAN_LIBS: ${LIBASSUAN_LIBS}
EOF
View
88 doc/Makefile.am
@@ -1,64 +1,31 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-wikidir=$(htmldir)/wiki
-
-if ENABLE_DOC
-SUBDIRS = nonpersistent
-endif
-DIST_SUBDIRS = nonpersistent
-
-dist_noinst_DATA = $(srcdir)/tools/*.xml \
- $(srcdir)/api/*.xml \
- $(srcdir)/api/apps/*.xml \
- $(srcdir)/api/asn1/*.xml \
- $(srcdir)/api/card/*.xml \
- $(srcdir)/api/file/*.xml \
- $(srcdir)/api/init/*.xml \
- $(srcdir)/api/misc/*.xml \
- $(srcdir)/api/types/*.xml \
- $(srcdir)/api/util/*.xml \
- $(srcdir)/api/api.css \
- $(srcdir)/api/*.xsl
-
+dist_noinst_SCRIPTS = svn2cl.xsl html.xsl man.xsl
+dist_noinst_DATA = $(srcdir)/tools/*.xml api.css
if ENABLE_DOC
-dist_html_DATA = html.out/*
-else
-dist_noinst_DATA += html.out/*
+html_DATA = html.out/*
endif