nutcracker 0.2.4.4 → 0.2.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (293) hide show
  1. data/README.md +1 -1
  2. data/ext/nutcracker/ChangeLog +0 -0
  3. data/ext/nutcracker/LICENSE +0 -0
  4. data/ext/nutcracker/Makefile +643 -0
  5. data/ext/nutcracker/Makefile.am +0 -0
  6. data/ext/nutcracker/Makefile.in +82 -190
  7. data/ext/nutcracker/NOTICE +0 -0
  8. data/ext/nutcracker/README.md +0 -0
  9. data/ext/nutcracker/aclocal.m4 +122 -231
  10. data/ext/nutcracker/autom4te.cache/output.0 +18664 -0
  11. data/ext/nutcracker/autom4te.cache/output.1 +18664 -0
  12. data/ext/nutcracker/autom4te.cache/output.2 +18664 -0
  13. data/ext/nutcracker/autom4te.cache/requests +494 -0
  14. data/ext/nutcracker/autom4te.cache/traces.0 +2415 -0
  15. data/ext/nutcracker/autom4te.cache/traces.1 +945 -0
  16. data/ext/nutcracker/autom4te.cache/traces.2 +2415 -0
  17. data/ext/nutcracker/conf/nutcracker.leaf.yml +0 -0
  18. data/ext/nutcracker/conf/nutcracker.root.yml +0 -0
  19. data/ext/nutcracker/conf/nutcracker.yml +0 -0
  20. data/ext/nutcracker/config.h +332 -0
  21. data/ext/nutcracker/config.h.in +15 -0
  22. data/ext/nutcracker/config.log +2684 -0
  23. data/ext/nutcracker/config.status +2317 -0
  24. data/ext/nutcracker/config/config.guess +248 -278
  25. data/ext/nutcracker/config/config.sub +77 -234
  26. data/ext/nutcracker/config/depcomp +39 -143
  27. data/ext/nutcracker/config/install-sh +116 -136
  28. data/ext/nutcracker/config/ltmain.sh +788 -1704
  29. data/ext/nutcracker/config/missing +65 -29
  30. data/ext/nutcracker/configure +1068 -2014
  31. data/ext/nutcracker/configure.ac +34 -2
  32. data/ext/nutcracker/contrib/Makefile +494 -0
  33. data/ext/nutcracker/contrib/Makefile.am +0 -0
  34. data/ext/nutcracker/contrib/Makefile.in +47 -120
  35. data/ext/nutcracker/contrib/yaml-0.1.4.tar.gz +0 -0
  36. data/ext/nutcracker/contrib/yaml-0.1.4/Makefile +736 -0
  37. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/output.0 +13102 -0
  38. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/output.1 +13085 -0
  39. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/output.2 +13085 -0
  40. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/requests +476 -0
  41. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/traces.0 +2339 -0
  42. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/traces.1 +545 -0
  43. data/ext/nutcracker/contrib/yaml-0.1.4/autom4te.cache/traces.2 +2339 -0
  44. data/ext/nutcracker/contrib/yaml-0.1.4/config.h +81 -0
  45. data/ext/nutcracker/contrib/yaml-0.1.4/config.h.in~ +80 -0
  46. data/ext/nutcracker/contrib/yaml-0.1.4/config.log +688 -0
  47. data/ext/nutcracker/contrib/yaml-0.1.4/config.status +2032 -0
  48. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/annotated.html +51 -0
  49. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/bc_s.png +0 -0
  50. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/classes.html +41 -0
  51. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/closed.png +0 -0
  52. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/doxygen.css +656 -0
  53. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/doxygen.png +0 -0
  54. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/files.html +40 -0
  55. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions.html +91 -0
  56. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x62.html +84 -0
  57. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x63.html +87 -0
  58. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x64.html +83 -0
  59. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x65.html +110 -0
  60. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x66.html +79 -0
  61. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x68.html +80 -0
  62. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x69.html +92 -0
  63. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x6b.html +71 -0
  64. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x6c.html +88 -0
  65. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x6d.html +96 -0
  66. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x6e.html +71 -0
  67. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x6f.html +80 -0
  68. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x70.html +100 -0
  69. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x71.html +71 -0
  70. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x72.html +87 -0
  71. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x73.html +163 -0
  72. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x74.html +115 -0
  73. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x75.html +71 -0
  74. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x76.html +80 -0
  75. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_0x77.html +77 -0
  76. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars.html +91 -0
  77. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x62.html +84 -0
  78. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x63.html +87 -0
  79. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x64.html +83 -0
  80. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x65.html +110 -0
  81. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x66.html +79 -0
  82. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x68.html +80 -0
  83. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x69.html +92 -0
  84. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x6b.html +71 -0
  85. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x6c.html +88 -0
  86. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x6d.html +96 -0
  87. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x6e.html +71 -0
  88. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x6f.html +80 -0
  89. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x70.html +100 -0
  90. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x71.html +71 -0
  91. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x72.html +87 -0
  92. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x73.html +163 -0
  93. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x74.html +115 -0
  94. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x75.html +71 -0
  95. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x76.html +80 -0
  96. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/functions_vars_0x77.html +77 -0
  97. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals.html +667 -0
  98. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals_defs.html +81 -0
  99. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals_enum.html +78 -0
  100. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals_eval.html +373 -0
  101. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals_func.html +196 -0
  102. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/globals_type.html +126 -0
  103. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__basic.html +320 -0
  104. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__emitter.html +819 -0
  105. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__events.html +664 -0
  106. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__export.html +60 -0
  107. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__nodes.html +795 -0
  108. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__parser.html +606 -0
  109. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__styles.html +222 -0
  110. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__tokens.html +246 -0
  111. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/group__version.html +106 -0
  112. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/index.html +31 -0
  113. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/modules.html +42 -0
  114. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/nav_f.png +0 -0
  115. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/nav_h.png +0 -0
  116. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/open.png +0 -0
  117. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__alias__data__s.html +108 -0
  118. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__document__s.html +235 -0
  119. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__emitter__s.html +1300 -0
  120. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__event__s.html +496 -0
  121. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__mark__s.html +108 -0
  122. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__node__pair__s.html +91 -0
  123. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__node__s.html +420 -0
  124. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__parser__s.html +1229 -0
  125. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__simple__key__s.html +97 -0
  126. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__tag__directive__s.html +91 -0
  127. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__token__s.html +413 -0
  128. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/structyaml__version__directive__s.html +91 -0
  129. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/tab_a.png +0 -0
  130. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/tab_b.png +0 -0
  131. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/tab_h.png +0 -0
  132. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/tab_s.png +0 -0
  133. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/tabs.css +59 -0
  134. data/ext/nutcracker/contrib/yaml-0.1.4/doc/html/yaml_8h.html +525 -0
  135. data/ext/nutcracker/contrib/yaml-0.1.4/include/Makefile.am +17 -0
  136. data/ext/nutcracker/contrib/yaml-0.1.4/include/Makefile.in +470 -0
  137. data/ext/nutcracker/contrib/yaml-0.1.4/libtool +8890 -0
  138. data/ext/nutcracker/contrib/yaml-0.1.4/src/Makefile +484 -0
  139. data/ext/nutcracker/contrib/yaml-0.1.4/src/api.lo +12 -0
  140. data/ext/nutcracker/contrib/yaml-0.1.4/src/api.o +0 -0
  141. data/ext/nutcracker/contrib/yaml-0.1.4/src/dumper.lo +12 -0
  142. data/ext/nutcracker/contrib/yaml-0.1.4/src/dumper.o +0 -0
  143. data/ext/nutcracker/contrib/yaml-0.1.4/src/emitter.lo +12 -0
  144. data/ext/nutcracker/contrib/yaml-0.1.4/src/emitter.o +0 -0
  145. data/ext/nutcracker/contrib/yaml-0.1.4/src/libyaml.la +41 -0
  146. data/ext/nutcracker/contrib/yaml-0.1.4/src/loader.lo +12 -0
  147. data/ext/nutcracker/contrib/yaml-0.1.4/src/loader.o +0 -0
  148. data/ext/nutcracker/contrib/yaml-0.1.4/src/parser.lo +12 -0
  149. data/ext/nutcracker/contrib/yaml-0.1.4/src/parser.o +0 -0
  150. data/ext/nutcracker/contrib/yaml-0.1.4/src/reader.lo +12 -0
  151. data/ext/nutcracker/contrib/yaml-0.1.4/src/reader.o +0 -0
  152. data/ext/nutcracker/contrib/yaml-0.1.4/src/scanner.lo +12 -0
  153. data/ext/nutcracker/contrib/yaml-0.1.4/src/scanner.o +0 -0
  154. data/ext/nutcracker/contrib/yaml-0.1.4/src/writer.lo +12 -0
  155. data/ext/nutcracker/contrib/yaml-0.1.4/src/writer.o +0 -0
  156. data/ext/nutcracker/contrib/yaml-0.1.4/stamp-h1 +1 -0
  157. data/ext/nutcracker/contrib/yaml-0.1.4/tests/Makefile +675 -0
  158. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor +0 -0
  159. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor-alt +0 -0
  160. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor-alt.o +0 -0
  161. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-deconstructor.o +0 -0
  162. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter +0 -0
  163. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter-alt +0 -0
  164. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter-alt.o +0 -0
  165. data/ext/nutcracker/contrib/yaml-0.1.4/tests/example-reformatter.o +0 -0
  166. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-dumper +0 -0
  167. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-dumper.o +0 -0
  168. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-emitter +0 -0
  169. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-emitter.o +0 -0
  170. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-loader +0 -0
  171. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-loader.o +0 -0
  172. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-parser +0 -0
  173. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-parser.o +0 -0
  174. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-scanner +0 -0
  175. data/ext/nutcracker/contrib/yaml-0.1.4/tests/run-scanner.o +0 -0
  176. data/ext/nutcracker/contrib/yaml-0.1.4/yaml-0.1.pc +10 -0
  177. data/ext/nutcracker/contrib/yaml-0.1.4/yaml-0.1.pc.in +10 -0
  178. data/ext/nutcracker/exconf.rb +0 -0
  179. data/ext/nutcracker/extconf.rb +2 -5
  180. data/ext/nutcracker/libtool +9403 -0
  181. data/ext/nutcracker/m4/libtool.m4 +396 -960
  182. data/ext/nutcracker/m4/ltoptions.m4 +2 -17
  183. data/ext/nutcracker/m4/ltversion.m4 +6 -6
  184. data/ext/nutcracker/notes/c-styleguide.txt +0 -0
  185. data/ext/nutcracker/notes/debug.txt +0 -0
  186. data/ext/nutcracker/notes/memcache.txt +0 -0
  187. data/ext/nutcracker/notes/recommendation.md +0 -0
  188. data/ext/nutcracker/notes/redis.md +0 -0
  189. data/ext/nutcracker/notes/socket.txt +0 -0
  190. data/ext/nutcracker/scripts/nutcracker.init +0 -0
  191. data/ext/nutcracker/scripts/nutcracker.spec +0 -0
  192. data/ext/nutcracker/scripts/redis-check.py +0 -0
  193. data/ext/nutcracker/src/Makefile +647 -0
  194. data/ext/nutcracker/src/Makefile.am +1 -1
  195. data/ext/nutcracker/src/Makefile.in +81 -167
  196. data/ext/nutcracker/src/hashkit/Makefile +476 -0
  197. data/ext/nutcracker/src/hashkit/Makefile.am +0 -0
  198. data/ext/nutcracker/src/hashkit/Makefile.in +37 -72
  199. data/ext/nutcracker/src/hashkit/libhashkit.a +0 -0
  200. data/ext/nutcracker/src/hashkit/nc_crc16.c +0 -0
  201. data/ext/nutcracker/src/hashkit/nc_crc16.o +0 -0
  202. data/ext/nutcracker/src/hashkit/nc_crc32.c +0 -0
  203. data/ext/nutcracker/src/hashkit/nc_crc32.o +0 -0
  204. data/ext/nutcracker/src/hashkit/nc_fnv.c +0 -0
  205. data/ext/nutcracker/src/hashkit/nc_fnv.o +0 -0
  206. data/ext/nutcracker/src/hashkit/nc_hashkit.h +0 -0
  207. data/ext/nutcracker/src/hashkit/nc_hsieh.c +0 -0
  208. data/ext/nutcracker/src/hashkit/nc_hsieh.o +0 -0
  209. data/ext/nutcracker/src/hashkit/nc_jenkins.c +0 -0
  210. data/ext/nutcracker/src/hashkit/nc_jenkins.o +0 -0
  211. data/ext/nutcracker/src/hashkit/nc_ketama.c +0 -0
  212. data/ext/nutcracker/src/hashkit/nc_ketama.o +0 -0
  213. data/ext/nutcracker/src/hashkit/nc_md5.c +0 -0
  214. data/ext/nutcracker/src/hashkit/nc_md5.o +0 -0
  215. data/ext/nutcracker/src/hashkit/nc_modula.c +0 -0
  216. data/ext/nutcracker/src/hashkit/nc_modula.o +0 -0
  217. data/ext/nutcracker/src/hashkit/nc_murmur.c +0 -0
  218. data/ext/nutcracker/src/hashkit/nc_murmur.o +0 -0
  219. data/ext/nutcracker/src/hashkit/nc_one_at_a_time.c +0 -0
  220. data/ext/nutcracker/src/hashkit/nc_one_at_a_time.o +0 -0
  221. data/ext/nutcracker/src/hashkit/nc_random.c +0 -0
  222. data/ext/nutcracker/src/hashkit/nc_random.o +0 -0
  223. data/ext/nutcracker/src/nc.c +0 -0
  224. data/ext/nutcracker/src/nc.o +0 -0
  225. data/ext/nutcracker/src/nc_array.c +0 -0
  226. data/ext/nutcracker/src/nc_array.h +0 -0
  227. data/ext/nutcracker/src/nc_array.o +0 -0
  228. data/ext/nutcracker/src/nc_client.c +0 -0
  229. data/ext/nutcracker/src/nc_client.h +0 -0
  230. data/ext/nutcracker/src/nc_client.o +0 -0
  231. data/ext/nutcracker/src/nc_conf.c +0 -0
  232. data/ext/nutcracker/src/nc_conf.h +0 -0
  233. data/ext/nutcracker/src/nc_conf.o +0 -0
  234. data/ext/nutcracker/src/nc_connection.c +0 -0
  235. data/ext/nutcracker/src/nc_connection.h +0 -0
  236. data/ext/nutcracker/src/nc_connection.o +0 -0
  237. data/ext/nutcracker/src/nc_core.c +29 -26
  238. data/ext/nutcracker/src/nc_core.h +13 -5
  239. data/ext/nutcracker/src/nc_core.o +0 -0
  240. data/ext/nutcracker/src/{nc_event.c → nc_epoll.c} +94 -30
  241. data/ext/nutcracker/src/nc_epoll.o +0 -0
  242. data/ext/nutcracker/src/nc_event.h +33 -13
  243. data/ext/nutcracker/src/nc_kqueue.c +296 -0
  244. data/ext/nutcracker/src/nc_kqueue.o +0 -0
  245. data/ext/nutcracker/src/nc_log.c +0 -0
  246. data/ext/nutcracker/src/nc_log.h +0 -0
  247. data/ext/nutcracker/src/nc_log.o +0 -0
  248. data/ext/nutcracker/src/nc_mbuf.c +0 -0
  249. data/ext/nutcracker/src/nc_mbuf.h +0 -0
  250. data/ext/nutcracker/src/nc_mbuf.o +0 -0
  251. data/ext/nutcracker/src/nc_message.c +0 -0
  252. data/ext/nutcracker/src/nc_message.h +0 -0
  253. data/ext/nutcracker/src/nc_message.o +0 -0
  254. data/ext/nutcracker/src/nc_proxy.c +8 -8
  255. data/ext/nutcracker/src/nc_proxy.h +0 -0
  256. data/ext/nutcracker/src/nc_proxy.o +0 -0
  257. data/ext/nutcracker/src/nc_queue.h +0 -0
  258. data/ext/nutcracker/src/nc_rbtree.c +0 -0
  259. data/ext/nutcracker/src/nc_rbtree.h +0 -0
  260. data/ext/nutcracker/src/nc_rbtree.o +0 -0
  261. data/ext/nutcracker/src/nc_request.c +3 -3
  262. data/ext/nutcracker/src/nc_request.o +0 -0
  263. data/ext/nutcracker/src/nc_response.c +4 -6
  264. data/ext/nutcracker/src/nc_response.o +0 -0
  265. data/ext/nutcracker/src/nc_server.c +5 -5
  266. data/ext/nutcracker/src/nc_server.h +0 -0
  267. data/ext/nutcracker/src/nc_server.o +0 -0
  268. data/ext/nutcracker/src/nc_signal.c +0 -0
  269. data/ext/nutcracker/src/nc_signal.h +0 -0
  270. data/ext/nutcracker/src/nc_signal.o +0 -0
  271. data/ext/nutcracker/src/nc_stats.c +16 -21
  272. data/ext/nutcracker/src/nc_stats.h +3 -4
  273. data/ext/nutcracker/src/nc_stats.o +0 -0
  274. data/ext/nutcracker/src/nc_string.c +0 -0
  275. data/ext/nutcracker/src/nc_string.h +0 -0
  276. data/ext/nutcracker/src/nc_string.o +0 -0
  277. data/ext/nutcracker/src/nc_util.c +16 -0
  278. data/ext/nutcracker/src/nc_util.h +1 -0
  279. data/ext/nutcracker/src/nc_util.o +0 -0
  280. data/ext/nutcracker/src/nutcracker +0 -0
  281. data/ext/nutcracker/src/proto/Makefile +454 -0
  282. data/ext/nutcracker/src/proto/Makefile.am +0 -0
  283. data/ext/nutcracker/src/proto/Makefile.in +37 -72
  284. data/ext/nutcracker/src/proto/libproto.a +0 -0
  285. data/ext/nutcracker/src/proto/nc_memcache.c +0 -0
  286. data/ext/nutcracker/src/proto/nc_memcache.o +0 -0
  287. data/ext/nutcracker/src/proto/nc_proto.h +0 -0
  288. data/ext/nutcracker/src/proto/nc_redis.c +0 -0
  289. data/ext/nutcracker/src/proto/nc_redis.o +0 -0
  290. data/ext/nutcracker/stamp-h1 +1 -0
  291. data/lib/nutcracker.rb +95 -4
  292. data/lib/nutcracker/version.rb +1 -1
  293. metadata +217 -4
@@ -1,9 +1,10 @@
1
+ # Generated from ltmain.m4sh.
1
2
 
2
- # libtool (GNU libtool) 2.4.2
3
+ # libtool (GNU libtool) 2.2.10
3
4
  # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
4
5
 
5
6
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
6
- # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
7
+ # 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
7
8
  # This is free software; see the source for copying conditions. There is NO
8
9
  # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9
10
 
@@ -41,7 +42,6 @@
41
42
  # --quiet, --silent don't print informational messages
42
43
  # --no-quiet, --no-silent
43
44
  # print informational messages (default)
44
- # --no-warn don't display warning messages
45
45
  # --tag=TAG use configuration variables from tag TAG
46
46
  # -v, --verbose print more informational messages than default
47
47
  # --no-verbose don't print the extra informational messages
@@ -70,19 +70,17 @@
70
70
  # compiler: $LTCC
71
71
  # compiler flags: $LTCFLAGS
72
72
  # linker: $LD (gnu? $with_gnu_ld)
73
- # $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
73
+ # $progname: (GNU libtool) 2.2.10
74
74
  # automake: $automake_version
75
75
  # autoconf: $autoconf_version
76
76
  #
77
77
  # Report bugs to <bug-libtool@gnu.org>.
78
- # GNU libtool home page: <http://www.gnu.org/software/libtool/>.
79
- # General help using GNU software: <http://www.gnu.org/gethelp/>.
80
78
 
81
79
  PROGRAM=libtool
82
80
  PACKAGE=libtool
83
- VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
81
+ VERSION=2.2.10
84
82
  TIMESTAMP=""
85
- package_revision=1.3337
83
+ package_revision=1.3175
86
84
 
87
85
  # Be Bourne compatible
88
86
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -137,10 +135,15 @@ progpath="$0"
137
135
 
138
136
  : ${CP="cp -f"}
139
137
  test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
138
+ : ${EGREP="/usr/bin/grep -E"}
139
+ : ${FGREP="/usr/bin/grep -F"}
140
+ : ${GREP="/usr/bin/grep"}
141
+ : ${LN_S="ln -s"}
140
142
  : ${MAKE="make"}
141
143
  : ${MKDIR="mkdir"}
142
144
  : ${MV="mv -f"}
143
145
  : ${RM="rm -f"}
146
+ : ${SED="/usr/bin/sed"}
144
147
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
145
148
  : ${Xsed="$SED -e 1s/^X//"}
146
149
 
@@ -160,27 +163,6 @@ IFS=" $lt_nl"
160
163
  dirname="s,/[^/]*$,,"
161
164
  basename="s,^.*/,,"
162
165
 
163
- # func_dirname file append nondir_replacement
164
- # Compute the dirname of FILE. If nonempty, add APPEND to the result,
165
- # otherwise set result to NONDIR_REPLACEMENT.
166
- func_dirname ()
167
- {
168
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
169
- if test "X$func_dirname_result" = "X${1}"; then
170
- func_dirname_result="${3}"
171
- else
172
- func_dirname_result="$func_dirname_result${2}"
173
- fi
174
- } # func_dirname may be replaced by extended shell implementation
175
-
176
-
177
- # func_basename file
178
- func_basename ()
179
- {
180
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
181
- } # func_basename may be replaced by extended shell implementation
182
-
183
-
184
166
  # func_dirname_and_basename file append nondir_replacement
185
167
  # perform func_basename and func_dirname in a single function
186
168
  # call:
@@ -195,31 +177,17 @@ func_basename ()
195
177
  # those functions but instead duplicate the functionality here.
196
178
  func_dirname_and_basename ()
197
179
  {
198
- # Extract subdirectory from the argument.
199
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
200
- if test "X$func_dirname_result" = "X${1}"; then
201
- func_dirname_result="${3}"
202
- else
203
- func_dirname_result="$func_dirname_result${2}"
204
- fi
205
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
206
- } # func_dirname_and_basename may be replaced by extended shell implementation
207
-
208
-
209
- # func_stripname prefix suffix name
210
- # strip PREFIX and SUFFIX off of NAME.
211
- # PREFIX and SUFFIX must not contain globbing or regex special
212
- # characters, hashes, percent signs, but SUFFIX may contain a leading
213
- # dot (in which case that matches only a dot).
214
- # func_strip_suffix prefix name
215
- func_stripname ()
216
- {
217
- case ${2} in
218
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
219
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
220
- esac
221
- } # func_stripname may be replaced by extended shell implementation
180
+ # Extract subdirectory from the argument.
181
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
182
+ if test "X$func_dirname_result" = "X${1}"; then
183
+ func_dirname_result="${3}"
184
+ else
185
+ func_dirname_result="$func_dirname_result${2}"
186
+ fi
187
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
188
+ }
222
189
 
190
+ # Generated shell functions inserted here.
223
191
 
224
192
  # These SED scripts presuppose an absolute path with a trailing slash.
225
193
  pathcar='s,^/\([^/]*\).*$,\1,'
@@ -383,7 +351,7 @@ case $progpath in
383
351
  ;;
384
352
  *)
385
353
  save_IFS="$IFS"
386
- IFS=${PATH_SEPARATOR-:}
354
+ IFS=:
387
355
  for progdir in $PATH; do
388
356
  IFS="$save_IFS"
389
357
  test -x "$progdir/$progname" && break
@@ -402,15 +370,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
402
370
  # Same as above, but do not quote variable references.
403
371
  double_quote_subst='s/\(["`\\]\)/\\\1/g'
404
372
 
405
- # Sed substitution that turns a string into a regex matching for the
406
- # string literally.
407
- sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
408
-
409
- # Sed substitution that converts a w32 file name or path
410
- # which contains forward slashes, into one that contains
411
- # (escaped) backslashes. A very naive implementation.
412
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
413
-
414
373
  # Re-`\' parameter expansions in output of double_quote_subst that were
415
374
  # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
416
375
  # in input to double_quote_subst, that '$' was protected from expansion.
@@ -439,7 +398,7 @@ opt_warning=:
439
398
  # name if it has been set yet.
440
399
  func_echo ()
441
400
  {
442
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
401
+ $ECHO "$progname${mode+: }$mode: $*"
443
402
  }
444
403
 
445
404
  # func_verbose arg...
@@ -465,14 +424,14 @@ func_echo_all ()
465
424
  # Echo program name prefixed message to standard error.
466
425
  func_error ()
467
426
  {
468
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
427
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
469
428
  }
470
429
 
471
430
  # func_warning arg...
472
431
  # Echo program name prefixed warning message to standard error.
473
432
  func_warning ()
474
433
  {
475
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
434
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
476
435
 
477
436
  # bash bug again:
478
437
  :
@@ -691,30 +650,11 @@ func_show_eval_locale ()
691
650
  fi
692
651
  }
693
652
 
694
- # func_tr_sh
695
- # Turn $1 into a string suitable for a shell variable name.
696
- # Result is stored in $func_tr_sh_result. All characters
697
- # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
698
- # if $1 begins with a digit, a '_' is prepended as well.
699
- func_tr_sh ()
700
- {
701
- case $1 in
702
- [0-9]* | *[!a-zA-Z0-9_]*)
703
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
704
- ;;
705
- * )
706
- func_tr_sh_result=$1
707
- ;;
708
- esac
709
- }
710
-
711
653
 
712
654
  # func_version
713
655
  # Echo version message to standard output and exit.
714
656
  func_version ()
715
657
  {
716
- $opt_debug
717
-
718
658
  $SED -n '/(C)/!b go
719
659
  :more
720
660
  /\./!{
@@ -736,8 +676,6 @@ func_version ()
736
676
  # Echo short help message to standard output and exit.
737
677
  func_usage ()
738
678
  {
739
- $opt_debug
740
-
741
679
  $SED -n '/^# Usage:/,/^# *.*--help/ {
742
680
  s/^# //
743
681
  s/^# *$//
@@ -754,10 +692,7 @@ func_usage ()
754
692
  # unless 'noexit' is passed as argument.
755
693
  func_help ()
756
694
  {
757
- $opt_debug
758
-
759
695
  $SED -n '/^# Usage:/,/# Report bugs to/ {
760
- :print
761
696
  s/^# //
762
697
  s/^# *$//
763
698
  s*\$progname*'$progname'*
@@ -767,14 +702,10 @@ func_help ()
767
702
  s*\$LTCFLAGS*'"$LTCFLAGS"'*
768
703
  s*\$LD*'"$LD"'*
769
704
  s/\$with_gnu_ld/'"$with_gnu_ld"'/
770
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
771
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
705
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
706
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
772
707
  p
773
- d
774
- }
775
- /^# .* home page:/b print
776
- /^# General help using/b print
777
- ' < "$progpath"
708
+ }' < "$progpath"
778
709
  ret=$?
779
710
  if test -z "$1"; then
780
711
  exit $ret
@@ -786,106 +717,40 @@ func_help ()
786
717
  # exit_cmd.
787
718
  func_missing_arg ()
788
719
  {
789
- $opt_debug
790
-
791
720
  func_error "missing argument for $1."
792
721
  exit_cmd=exit
793
722
  }
794
723
 
795
-
796
- # func_split_short_opt shortopt
797
- # Set func_split_short_opt_name and func_split_short_opt_arg shell
798
- # variables after splitting SHORTOPT after the 2nd character.
799
- func_split_short_opt ()
800
- {
801
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
802
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
803
-
804
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
805
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
806
- } # func_split_short_opt may be replaced by extended shell implementation
807
-
808
-
809
- # func_split_long_opt longopt
810
- # Set func_split_long_opt_name and func_split_long_opt_arg shell
811
- # variables after splitting LONGOPT at the `=' sign.
812
- func_split_long_opt ()
813
- {
814
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
815
- my_sed_long_arg='1s/^--[^=]*=//'
816
-
817
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
818
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
819
- } # func_split_long_opt may be replaced by extended shell implementation
820
-
821
724
  exit_cmd=:
822
725
 
823
726
 
824
727
 
825
728
 
826
729
 
730
+
827
731
  magic="%%%MAGIC variable%%%"
828
732
  magic_exe="%%%MAGIC EXE variable%%%"
829
733
 
830
734
  # Global variables.
735
+ # $mode is unset
831
736
  nonopt=
737
+ execute_dlfiles=
832
738
  preserve_args=
833
739
  lo2o="s/\\.lo\$/.${objext}/"
834
740
  o2lo="s/\\.${objext}\$/.lo/"
835
741
  extracted_archives=
836
742
  extracted_serial=0
837
743
 
744
+ opt_dry_run=false
745
+ opt_duplicate_deps=false
746
+ opt_silent=false
747
+ opt_debug=:
748
+
838
749
  # If this variable is set in any of the actions, the command in it
839
750
  # will be execed at the end. This prevents here-documents from being
840
751
  # left over by shells.
841
752
  exec_cmd=
842
753
 
843
- # func_append var value
844
- # Append VALUE to the end of shell variable VAR.
845
- func_append ()
846
- {
847
- eval "${1}=\$${1}\${2}"
848
- } # func_append may be replaced by extended shell implementation
849
-
850
- # func_append_quoted var value
851
- # Quote VALUE and append to the end of shell variable VAR, separated
852
- # by a space.
853
- func_append_quoted ()
854
- {
855
- func_quote_for_eval "${2}"
856
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
857
- } # func_append_quoted may be replaced by extended shell implementation
858
-
859
-
860
- # func_arith arithmetic-term...
861
- func_arith ()
862
- {
863
- func_arith_result=`expr "${@}"`
864
- } # func_arith may be replaced by extended shell implementation
865
-
866
-
867
- # func_len string
868
- # STRING may not start with a hyphen.
869
- func_len ()
870
- {
871
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
872
- } # func_len may be replaced by extended shell implementation
873
-
874
-
875
- # func_lo2o object
876
- func_lo2o ()
877
- {
878
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
879
- } # func_lo2o may be replaced by extended shell implementation
880
-
881
-
882
- # func_xform libobj-or-source
883
- func_xform ()
884
- {
885
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
886
- } # func_xform may be replaced by extended shell implementation
887
-
888
-
889
754
  # func_fatal_configuration arg...
890
755
  # Echo program name prefixed message to standard error, followed by
891
756
  # a configuration failure hint, and exit.
@@ -975,209 +840,129 @@ func_enable_tag ()
975
840
  esac
976
841
  }
977
842
 
978
- # func_check_version_match
979
- # Ensure that we are using m4 macros, and libtool script from the same
980
- # release of libtool.
981
- func_check_version_match ()
843
+ # Parse options once, thoroughly. This comes as soon as possible in
844
+ # the script to make things like `libtool --version' happen quickly.
982
845
  {
983
- if test "$package_revision" != "$macro_revision"; then
984
- if test "$VERSION" != "$macro_version"; then
985
- if test -z "$macro_version"; then
986
- cat >&2 <<_LT_EOF
987
- $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
988
- $progname: definition of this LT_INIT comes from an older release.
989
- $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
990
- $progname: and run autoconf again.
991
- _LT_EOF
992
- else
993
- cat >&2 <<_LT_EOF
994
- $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
995
- $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
996
- $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
997
- $progname: and run autoconf again.
998
- _LT_EOF
999
- fi
1000
- else
1001
- cat >&2 <<_LT_EOF
1002
- $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
1003
- $progname: but the definition of this LT_INIT comes from revision $macro_revision.
1004
- $progname: You should recreate aclocal.m4 with macros from revision $package_revision
1005
- $progname: of $PACKAGE $VERSION and run autoconf again.
1006
- _LT_EOF
1007
- fi
1008
-
1009
- exit $EXIT_MISMATCH
1010
- fi
1011
- }
1012
-
1013
-
1014
- # Shorthand for --mode=foo, only valid as the first argument
1015
- case $1 in
1016
- clean|clea|cle|cl)
1017
- shift; set dummy --mode clean ${1+"$@"}; shift
1018
- ;;
1019
- compile|compil|compi|comp|com|co|c)
1020
- shift; set dummy --mode compile ${1+"$@"}; shift
1021
- ;;
1022
- execute|execut|execu|exec|exe|ex|e)
1023
- shift; set dummy --mode execute ${1+"$@"}; shift
1024
- ;;
1025
- finish|finis|fini|fin|fi|f)
1026
- shift; set dummy --mode finish ${1+"$@"}; shift
1027
- ;;
1028
- install|instal|insta|inst|ins|in|i)
1029
- shift; set dummy --mode install ${1+"$@"}; shift
1030
- ;;
1031
- link|lin|li|l)
1032
- shift; set dummy --mode link ${1+"$@"}; shift
1033
- ;;
1034
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
1035
- shift; set dummy --mode uninstall ${1+"$@"}; shift
1036
- ;;
1037
- esac
1038
-
1039
-
1040
-
1041
- # Option defaults:
1042
- opt_debug=:
1043
- opt_dry_run=false
1044
- opt_config=false
1045
- opt_preserve_dup_deps=false
1046
- opt_features=false
1047
- opt_finish=false
1048
- opt_help=false
1049
- opt_help_all=false
1050
- opt_silent=:
1051
- opt_warning=:
1052
- opt_verbose=:
1053
- opt_silent=false
1054
- opt_verbose=false
1055
846
 
847
+ # Shorthand for --mode=foo, only valid as the first argument
848
+ case $1 in
849
+ clean|clea|cle|cl)
850
+ shift; set dummy --mode clean ${1+"$@"}; shift
851
+ ;;
852
+ compile|compil|compi|comp|com|co|c)
853
+ shift; set dummy --mode compile ${1+"$@"}; shift
854
+ ;;
855
+ execute|execut|execu|exec|exe|ex|e)
856
+ shift; set dummy --mode execute ${1+"$@"}; shift
857
+ ;;
858
+ finish|finis|fini|fin|fi|f)
859
+ shift; set dummy --mode finish ${1+"$@"}; shift
860
+ ;;
861
+ install|instal|insta|inst|ins|in|i)
862
+ shift; set dummy --mode install ${1+"$@"}; shift
863
+ ;;
864
+ link|lin|li|l)
865
+ shift; set dummy --mode link ${1+"$@"}; shift
866
+ ;;
867
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
868
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
869
+ ;;
870
+ esac
1056
871
 
1057
- # Parse options once, thoroughly. This comes as soon as possible in the
1058
- # script to make things like `--version' happen as quickly as we can.
1059
- {
1060
- # this just eases exit handling
1061
- while test $# -gt 0; do
872
+ # Parse non-mode specific arguments:
873
+ while test "$#" -gt 0; do
1062
874
  opt="$1"
1063
875
  shift
876
+
1064
877
  case $opt in
1065
- --debug|-x) opt_debug='set -x'
878
+ --config) func_config ;;
879
+
880
+ --debug) preserve_args="$preserve_args $opt"
1066
881
  func_echo "enabling shell trace mode"
882
+ opt_debug='set -x'
1067
883
  $opt_debug
1068
884
  ;;
1069
- --dry-run|--dryrun|-n)
1070
- opt_dry_run=:
1071
- ;;
1072
- --config)
1073
- opt_config=:
1074
- func_config
885
+
886
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
887
+ execute_dlfiles="$execute_dlfiles $1"
888
+ shift
1075
889
  ;;
1076
- --dlopen|-dlopen)
1077
- optarg="$1"
1078
- opt_dlopen="${opt_dlopen+$opt_dlopen
1079
- }$optarg"
890
+
891
+ --dry-run | -n) opt_dry_run=: ;;
892
+ --features) func_features ;;
893
+ --finish) mode="finish" ;;
894
+
895
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
896
+ case $1 in
897
+ # Valid mode arguments:
898
+ clean) ;;
899
+ compile) ;;
900
+ execute) ;;
901
+ finish) ;;
902
+ install) ;;
903
+ link) ;;
904
+ relink) ;;
905
+ uninstall) ;;
906
+
907
+ # Catch anything else as an error
908
+ *) func_error "invalid argument for $opt"
909
+ exit_cmd=exit
910
+ break
911
+ ;;
912
+ esac
913
+
914
+ mode="$1"
1080
915
  shift
1081
916
  ;;
917
+
1082
918
  --preserve-dup-deps)
1083
- opt_preserve_dup_deps=:
1084
- ;;
1085
- --features)
1086
- opt_features=:
1087
- func_features
1088
- ;;
1089
- --finish)
1090
- opt_finish=:
1091
- set dummy --mode finish ${1+"$@"}; shift
1092
- ;;
1093
- --help)
1094
- opt_help=:
1095
- ;;
1096
- --help-all)
1097
- opt_help_all=:
1098
- opt_help=': help-all'
1099
- ;;
1100
- --mode)
1101
- test $# = 0 && func_missing_arg $opt && break
1102
- optarg="$1"
1103
- opt_mode="$optarg"
1104
- case $optarg in
1105
- # Valid mode arguments:
1106
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
1107
-
1108
- # Catch anything else as an error
1109
- *) func_error "invalid argument for $opt"
1110
- exit_cmd=exit
1111
- break
1112
- ;;
1113
- esac
1114
- shift
919
+ opt_duplicate_deps=: ;;
920
+
921
+ --quiet|--silent) preserve_args="$preserve_args $opt"
922
+ opt_silent=:
923
+ opt_verbose=false
1115
924
  ;;
1116
- --no-silent|--no-quiet)
925
+
926
+ --no-quiet|--no-silent)
927
+ preserve_args="$preserve_args $opt"
1117
928
  opt_silent=false
1118
- func_append preserve_args " $opt"
1119
929
  ;;
1120
- --no-warning|--no-warn)
1121
- opt_warning=false
1122
- func_append preserve_args " $opt"
930
+
931
+ --verbose| -v) preserve_args="$preserve_args $opt"
932
+ opt_silent=false
933
+ opt_verbose=:
1123
934
  ;;
1124
- --no-verbose)
935
+
936
+ --no-verbose) preserve_args="$preserve_args $opt"
1125
937
  opt_verbose=false
1126
- func_append preserve_args " $opt"
1127
- ;;
1128
- --silent|--quiet)
1129
- opt_silent=:
1130
- func_append preserve_args " $opt"
1131
- opt_verbose=false
1132
- ;;
1133
- --verbose|-v)
1134
- opt_verbose=:
1135
- func_append preserve_args " $opt"
1136
- opt_silent=false
1137
938
  ;;
1138
- --tag)
1139
- test $# = 0 && func_missing_arg $opt && break
1140
- optarg="$1"
1141
- opt_tag="$optarg"
1142
- func_append preserve_args " $opt $optarg"
1143
- func_enable_tag "$optarg"
939
+
940
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
941
+ preserve_args="$preserve_args $opt $1"
942
+ func_enable_tag "$1" # tagname is set here
1144
943
  shift
1145
944
  ;;
1146
945
 
1147
- -\?|-h) func_usage ;;
1148
- --help) func_help ;;
1149
- --version) func_version ;;
1150
-
1151
946
  # Separate optargs to long options:
1152
- --*=*)
1153
- func_split_long_opt "$opt"
1154
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
947
+ -dlopen=*|--mode=*|--tag=*)
948
+ func_opt_split "$opt"
949
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
1155
950
  shift
1156
951
  ;;
1157
952
 
1158
- # Separate non-argument short options:
1159
- -\?*|-h*|-n*|-v*)
1160
- func_split_short_opt "$opt"
1161
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
1162
- shift
1163
- ;;
953
+ -\?|-h) func_usage ;;
954
+ --help) opt_help=: ;;
955
+ --help-all) opt_help=': help-all' ;;
956
+ --version) func_version ;;
1164
957
 
1165
- --) break ;;
1166
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
1167
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
958
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
959
+
960
+ *) nonopt="$opt"
961
+ break
962
+ ;;
1168
963
  esac
1169
964
  done
1170
965
 
1171
- # Validate options:
1172
-
1173
- # save first non-option argument
1174
- if test "$#" -gt 0; then
1175
- nonopt="$opt"
1176
- shift
1177
- fi
1178
-
1179
- # preserve --debug
1180
- test "$opt_debug" = : || func_append preserve_args " --debug"
1181
966
 
1182
967
  case $host in
1183
968
  *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -1185,44 +970,82 @@ func_enable_tag "$optarg"
1185
970
  opt_duplicate_compiler_generated_deps=:
1186
971
  ;;
1187
972
  *)
1188
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
973
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
1189
974
  ;;
1190
975
  esac
1191
976
 
1192
- $opt_help || {
1193
- # Sanity checks first:
1194
- func_check_version_match
977
+ # Having warned about all mis-specified options, bail out if
978
+ # anything was wrong.
979
+ $exit_cmd $EXIT_FAILURE
980
+ }
1195
981
 
1196
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
1197
- func_fatal_configuration "not configured to build any kind of library"
982
+ # func_check_version_match
983
+ # Ensure that we are using m4 macros, and libtool script from the same
984
+ # release of libtool.
985
+ func_check_version_match ()
986
+ {
987
+ if test "$package_revision" != "$macro_revision"; then
988
+ if test "$VERSION" != "$macro_version"; then
989
+ if test -z "$macro_version"; then
990
+ cat >&2 <<_LT_EOF
991
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
992
+ $progname: definition of this LT_INIT comes from an older release.
993
+ $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
994
+ $progname: and run autoconf again.
995
+ _LT_EOF
996
+ else
997
+ cat >&2 <<_LT_EOF
998
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
999
+ $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
1000
+ $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
1001
+ $progname: and run autoconf again.
1002
+ _LT_EOF
1003
+ fi
1004
+ else
1005
+ cat >&2 <<_LT_EOF
1006
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
1007
+ $progname: but the definition of this LT_INIT comes from revision $macro_revision.
1008
+ $progname: You should recreate aclocal.m4 with macros from revision $package_revision
1009
+ $progname: of $PACKAGE $VERSION and run autoconf again.
1010
+ _LT_EOF
1198
1011
  fi
1199
1012
 
1200
- # Darwin sucks
1201
- eval std_shrext=\"$shrext_cmds\"
1013
+ exit $EXIT_MISMATCH
1014
+ fi
1015
+ }
1202
1016
 
1203
- # Only execute mode is allowed to have -dlopen flags.
1204
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
1205
- func_error "unrecognized option \`-dlopen'"
1206
- $ECHO "$help" 1>&2
1207
- exit $EXIT_FAILURE
1208
- fi
1209
1017
 
1210
- # Change the help message to a mode-specific one.
1211
- generic_help="$help"
1212
- help="Try \`$progname --help --mode=$opt_mode' for more information."
1213
- }
1018
+ ## ----------- ##
1019
+ ## Main. ##
1020
+ ## ----------- ##
1214
1021
 
1022
+ $opt_help || {
1023
+ # Sanity checks first:
1024
+ func_check_version_match
1215
1025
 
1216
- # Bail if the options were screwed
1217
- $exit_cmd $EXIT_FAILURE
1218
- }
1026
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
1027
+ func_fatal_configuration "not configured to build any kind of library"
1028
+ fi
1219
1029
 
1030
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
1220
1031
 
1221
1032
 
1033
+ # Darwin sucks
1034
+ eval std_shrext=\"$shrext_cmds\"
1035
+
1036
+
1037
+ # Only execute mode is allowed to have -dlopen flags.
1038
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
1039
+ func_error "unrecognized option \`-dlopen'"
1040
+ $ECHO "$help" 1>&2
1041
+ exit $EXIT_FAILURE
1042
+ fi
1043
+
1044
+ # Change the help message to a mode-specific one.
1045
+ generic_help="$help"
1046
+ help="Try \`$progname --help --mode=$mode' for more information."
1047
+ }
1222
1048
 
1223
- ## ----------- ##
1224
- ## Main. ##
1225
- ## ----------- ##
1226
1049
 
1227
1050
  # func_lalib_p file
1228
1051
  # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1287,9 +1110,12 @@ func_ltwrapper_executable_p ()
1287
1110
  # temporary ltwrapper_script.
1288
1111
  func_ltwrapper_scriptname ()
1289
1112
  {
1290
- func_dirname_and_basename "$1" "" "."
1291
- func_stripname '' '.exe' "$func_basename_result"
1292
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
1113
+ func_ltwrapper_scriptname_result=""
1114
+ if func_ltwrapper_executable_p "$1"; then
1115
+ func_dirname_and_basename "$1" "" "."
1116
+ func_stripname '' '.exe' "$func_basename_result"
1117
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
1118
+ fi
1293
1119
  }
1294
1120
 
1295
1121
  # func_ltwrapper_p file
@@ -1335,37 +1161,6 @@ func_source ()
1335
1161
  }
1336
1162
 
1337
1163
 
1338
- # func_resolve_sysroot PATH
1339
- # Replace a leading = in PATH with a sysroot. Store the result into
1340
- # func_resolve_sysroot_result
1341
- func_resolve_sysroot ()
1342
- {
1343
- func_resolve_sysroot_result=$1
1344
- case $func_resolve_sysroot_result in
1345
- =*)
1346
- func_stripname '=' '' "$func_resolve_sysroot_result"
1347
- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
1348
- ;;
1349
- esac
1350
- }
1351
-
1352
- # func_replace_sysroot PATH
1353
- # If PATH begins with the sysroot, replace it with = and
1354
- # store the result into func_replace_sysroot_result.
1355
- func_replace_sysroot ()
1356
- {
1357
- case "$lt_sysroot:$1" in
1358
- ?*:"$lt_sysroot"*)
1359
- func_stripname "$lt_sysroot" '' "$1"
1360
- func_replace_sysroot_result="=$func_stripname_result"
1361
- ;;
1362
- *)
1363
- # Including no sysroot.
1364
- func_replace_sysroot_result=$1
1365
- ;;
1366
- esac
1367
- }
1368
-
1369
1164
  # func_infer_tag arg
1370
1165
  # Infer tagged configuration to use if any are available and
1371
1166
  # if one wasn't chosen via the "--tag" command line option.
@@ -1378,7 +1173,8 @@ func_infer_tag ()
1378
1173
  if test -n "$available_tags" && test -z "$tagname"; then
1379
1174
  CC_quoted=
1380
1175
  for arg in $CC; do
1381
- func_append_quoted CC_quoted "$arg"
1176
+ func_quote_for_eval "$arg"
1177
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
1382
1178
  done
1383
1179
  CC_expanded=`func_echo_all $CC`
1384
1180
  CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1397,7 +1193,8 @@ func_infer_tag ()
1397
1193
  CC_quoted=
1398
1194
  for arg in $CC; do
1399
1195
  # Double-quote args containing other shell metacharacters.
1400
- func_append_quoted CC_quoted "$arg"
1196
+ func_quote_for_eval "$arg"
1197
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
1401
1198
  done
1402
1199
  CC_expanded=`func_echo_all $CC`
1403
1200
  CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1441,510 +1238,30 @@ func_write_libtool_object ()
1441
1238
  write_lobj=none
1442
1239
  fi
1443
1240
 
1444
- if test "$build_old_libs" = yes; then
1445
- write_oldobj=\'${3}\'
1446
- else
1447
- write_oldobj=none
1448
- fi
1449
-
1450
- $opt_dry_run || {
1451
- cat >${write_libobj}T <<EOF
1452
- # $write_libobj - a libtool object file
1453
- # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
1454
- #
1455
- # Please DO NOT delete this file!
1456
- # It is necessary for linking the library.
1457
-
1458
- # Name of the PIC object.
1459
- pic_object=$write_lobj
1460
-
1461
- # Name of the non-PIC object
1462
- non_pic_object=$write_oldobj
1463
-
1464
- EOF
1465
- $MV "${write_libobj}T" "${write_libobj}"
1466
- }
1467
- }
1468
-
1469
-
1470
- ##################################################
1471
- # FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
1472
- ##################################################
1473
-
1474
- # func_convert_core_file_wine_to_w32 ARG
1475
- # Helper function used by file name conversion functions when $build is *nix,
1476
- # and $host is mingw, cygwin, or some other w32 environment. Relies on a
1477
- # correctly configured wine environment available, with the winepath program
1478
- # in $build's $PATH.
1479
- #
1480
- # ARG is the $build file name to be converted to w32 format.
1481
- # Result is available in $func_convert_core_file_wine_to_w32_result, and will
1482
- # be empty on error (or when ARG is empty)
1483
- func_convert_core_file_wine_to_w32 ()
1484
- {
1485
- $opt_debug
1486
- func_convert_core_file_wine_to_w32_result="$1"
1487
- if test -n "$1"; then
1488
- # Unfortunately, winepath does not exit with a non-zero error code, so we
1489
- # are forced to check the contents of stdout. On the other hand, if the
1490
- # command is not found, the shell will set an exit code of 127 and print
1491
- # *an error message* to stdout. So we must check for both error code of
1492
- # zero AND non-empty stdout, which explains the odd construction:
1493
- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
1494
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
1495
- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
1496
- $SED -e "$lt_sed_naive_backslashify"`
1497
- else
1498
- func_convert_core_file_wine_to_w32_result=
1499
- fi
1500
- fi
1501
- }
1502
- # end: func_convert_core_file_wine_to_w32
1503
-
1504
-
1505
- # func_convert_core_path_wine_to_w32 ARG
1506
- # Helper function used by path conversion functions when $build is *nix, and
1507
- # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
1508
- # configured wine environment available, with the winepath program in $build's
1509
- # $PATH. Assumes ARG has no leading or trailing path separator characters.
1510
- #
1511
- # ARG is path to be converted from $build format to win32.
1512
- # Result is available in $func_convert_core_path_wine_to_w32_result.
1513
- # Unconvertible file (directory) names in ARG are skipped; if no directory names
1514
- # are convertible, then the result may be empty.
1515
- func_convert_core_path_wine_to_w32 ()
1516
- {
1517
- $opt_debug
1518
- # unfortunately, winepath doesn't convert paths, only file names
1519
- func_convert_core_path_wine_to_w32_result=""
1520
- if test -n "$1"; then
1521
- oldIFS=$IFS
1522
- IFS=:
1523
- for func_convert_core_path_wine_to_w32_f in $1; do
1524
- IFS=$oldIFS
1525
- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
1526
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
1527
- if test -z "$func_convert_core_path_wine_to_w32_result"; then
1528
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
1529
- else
1530
- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
1531
- fi
1532
- fi
1533
- done
1534
- IFS=$oldIFS
1535
- fi
1536
- }
1537
- # end: func_convert_core_path_wine_to_w32
1538
-
1539
-
1540
- # func_cygpath ARGS...
1541
- # Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
1542
- # when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
1543
- # $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
1544
- # (2), returns the Cygwin file name or path in func_cygpath_result (input
1545
- # file name or path is assumed to be in w32 format, as previously converted
1546
- # from $build's *nix or MSYS format). In case (3), returns the w32 file name
1547
- # or path in func_cygpath_result (input file name or path is assumed to be in
1548
- # Cygwin format). Returns an empty string on error.
1549
- #
1550
- # ARGS are passed to cygpath, with the last one being the file name or path to
1551
- # be converted.
1552
- #
1553
- # Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
1554
- # environment variable; do not put it in $PATH.
1555
- func_cygpath ()
1556
- {
1557
- $opt_debug
1558
- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
1559
- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
1560
- if test "$?" -ne 0; then
1561
- # on failure, ensure result is empty
1562
- func_cygpath_result=
1563
- fi
1564
- else
1565
- func_cygpath_result=
1566
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
1567
- fi
1568
- }
1569
- #end: func_cygpath
1570
-
1571
-
1572
- # func_convert_core_msys_to_w32 ARG
1573
- # Convert file name or path ARG from MSYS format to w32 format. Return
1574
- # result in func_convert_core_msys_to_w32_result.
1575
- func_convert_core_msys_to_w32 ()
1576
- {
1577
- $opt_debug
1578
- # awkward: cmd appends spaces to result
1579
- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
1580
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
1581
- }
1582
- #end: func_convert_core_msys_to_w32
1583
-
1584
-
1585
- # func_convert_file_check ARG1 ARG2
1586
- # Verify that ARG1 (a file name in $build format) was converted to $host
1587
- # format in ARG2. Otherwise, emit an error message, but continue (resetting
1588
- # func_to_host_file_result to ARG1).
1589
- func_convert_file_check ()
1590
- {
1591
- $opt_debug
1592
- if test -z "$2" && test -n "$1" ; then
1593
- func_error "Could not determine host file name corresponding to"
1594
- func_error " \`$1'"
1595
- func_error "Continuing, but uninstalled executables may not work."
1596
- # Fallback:
1597
- func_to_host_file_result="$1"
1598
- fi
1599
- }
1600
- # end func_convert_file_check
1601
-
1602
-
1603
- # func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
1604
- # Verify that FROM_PATH (a path in $build format) was converted to $host
1605
- # format in TO_PATH. Otherwise, emit an error message, but continue, resetting
1606
- # func_to_host_file_result to a simplistic fallback value (see below).
1607
- func_convert_path_check ()
1608
- {
1609
- $opt_debug
1610
- if test -z "$4" && test -n "$3"; then
1611
- func_error "Could not determine the host path corresponding to"
1612
- func_error " \`$3'"
1613
- func_error "Continuing, but uninstalled executables may not work."
1614
- # Fallback. This is a deliberately simplistic "conversion" and
1615
- # should not be "improved". See libtool.info.
1616
- if test "x$1" != "x$2"; then
1617
- lt_replace_pathsep_chars="s|$1|$2|g"
1618
- func_to_host_path_result=`echo "$3" |
1619
- $SED -e "$lt_replace_pathsep_chars"`
1620
- else
1621
- func_to_host_path_result="$3"
1622
- fi
1623
- fi
1624
- }
1625
- # end func_convert_path_check
1626
-
1627
-
1628
- # func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
1629
- # Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
1630
- # and appending REPL if ORIG matches BACKPAT.
1631
- func_convert_path_front_back_pathsep ()
1632
- {
1633
- $opt_debug
1634
- case $4 in
1635
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
1636
- ;;
1637
- esac
1638
- case $4 in
1639
- $2 ) func_append func_to_host_path_result "$3"
1640
- ;;
1641
- esac
1642
- }
1643
- # end func_convert_path_front_back_pathsep
1644
-
1645
-
1646
- ##################################################
1647
- # $build to $host FILE NAME CONVERSION FUNCTIONS #
1648
- ##################################################
1649
- # invoked via `$to_host_file_cmd ARG'
1650
- #
1651
- # In each case, ARG is the path to be converted from $build to $host format.
1652
- # Result will be available in $func_to_host_file_result.
1653
-
1654
-
1655
- # func_to_host_file ARG
1656
- # Converts the file name ARG from $build format to $host format. Return result
1657
- # in func_to_host_file_result.
1658
- func_to_host_file ()
1659
- {
1660
- $opt_debug
1661
- $to_host_file_cmd "$1"
1662
- }
1663
- # end func_to_host_file
1664
-
1665
-
1666
- # func_to_tool_file ARG LAZY
1667
- # converts the file name ARG from $build format to toolchain format. Return
1668
- # result in func_to_tool_file_result. If the conversion in use is listed
1669
- # in (the comma separated) LAZY, no conversion takes place.
1670
- func_to_tool_file ()
1671
- {
1672
- $opt_debug
1673
- case ,$2, in
1674
- *,"$to_tool_file_cmd",*)
1675
- func_to_tool_file_result=$1
1676
- ;;
1677
- *)
1678
- $to_tool_file_cmd "$1"
1679
- func_to_tool_file_result=$func_to_host_file_result
1680
- ;;
1681
- esac
1682
- }
1683
- # end func_to_tool_file
1684
-
1685
-
1686
- # func_convert_file_noop ARG
1687
- # Copy ARG to func_to_host_file_result.
1688
- func_convert_file_noop ()
1689
- {
1690
- func_to_host_file_result="$1"
1691
- }
1692
- # end func_convert_file_noop
1693
-
1694
-
1695
- # func_convert_file_msys_to_w32 ARG
1696
- # Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
1697
- # conversion to w32 is not available inside the cwrapper. Returns result in
1698
- # func_to_host_file_result.
1699
- func_convert_file_msys_to_w32 ()
1700
- {
1701
- $opt_debug
1702
- func_to_host_file_result="$1"
1703
- if test -n "$1"; then
1704
- func_convert_core_msys_to_w32 "$1"
1705
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
1706
- fi
1707
- func_convert_file_check "$1" "$func_to_host_file_result"
1708
- }
1709
- # end func_convert_file_msys_to_w32
1710
-
1711
-
1712
- # func_convert_file_cygwin_to_w32 ARG
1713
- # Convert file name ARG from Cygwin to w32 format. Returns result in
1714
- # func_to_host_file_result.
1715
- func_convert_file_cygwin_to_w32 ()
1716
- {
1717
- $opt_debug
1718
- func_to_host_file_result="$1"
1719
- if test -n "$1"; then
1720
- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
1721
- # LT_CYGPATH in this case.
1722
- func_to_host_file_result=`cygpath -m "$1"`
1723
- fi
1724
- func_convert_file_check "$1" "$func_to_host_file_result"
1725
- }
1726
- # end func_convert_file_cygwin_to_w32
1727
-
1728
-
1729
- # func_convert_file_nix_to_w32 ARG
1730
- # Convert file name ARG from *nix to w32 format. Requires a wine environment
1731
- # and a working winepath. Returns result in func_to_host_file_result.
1732
- func_convert_file_nix_to_w32 ()
1733
- {
1734
- $opt_debug
1735
- func_to_host_file_result="$1"
1736
- if test -n "$1"; then
1737
- func_convert_core_file_wine_to_w32 "$1"
1738
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
1739
- fi
1740
- func_convert_file_check "$1" "$func_to_host_file_result"
1741
- }
1742
- # end func_convert_file_nix_to_w32
1743
-
1744
-
1745
- # func_convert_file_msys_to_cygwin ARG
1746
- # Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
1747
- # Returns result in func_to_host_file_result.
1748
- func_convert_file_msys_to_cygwin ()
1749
- {
1750
- $opt_debug
1751
- func_to_host_file_result="$1"
1752
- if test -n "$1"; then
1753
- func_convert_core_msys_to_w32 "$1"
1754
- func_cygpath -u "$func_convert_core_msys_to_w32_result"
1755
- func_to_host_file_result="$func_cygpath_result"
1756
- fi
1757
- func_convert_file_check "$1" "$func_to_host_file_result"
1758
- }
1759
- # end func_convert_file_msys_to_cygwin
1760
-
1761
-
1762
- # func_convert_file_nix_to_cygwin ARG
1763
- # Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
1764
- # in a wine environment, working winepath, and LT_CYGPATH set. Returns result
1765
- # in func_to_host_file_result.
1766
- func_convert_file_nix_to_cygwin ()
1767
- {
1768
- $opt_debug
1769
- func_to_host_file_result="$1"
1770
- if test -n "$1"; then
1771
- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
1772
- func_convert_core_file_wine_to_w32 "$1"
1773
- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
1774
- func_to_host_file_result="$func_cygpath_result"
1775
- fi
1776
- func_convert_file_check "$1" "$func_to_host_file_result"
1777
- }
1778
- # end func_convert_file_nix_to_cygwin
1779
-
1780
-
1781
- #############################################
1782
- # $build to $host PATH CONVERSION FUNCTIONS #
1783
- #############################################
1784
- # invoked via `$to_host_path_cmd ARG'
1785
- #
1786
- # In each case, ARG is the path to be converted from $build to $host format.
1787
- # The result will be available in $func_to_host_path_result.
1788
- #
1789
- # Path separators are also converted from $build format to $host format. If
1790
- # ARG begins or ends with a path separator character, it is preserved (but
1791
- # converted to $host format) on output.
1792
- #
1793
- # All path conversion functions are named using the following convention:
1794
- # file name conversion function : func_convert_file_X_to_Y ()
1795
- # path conversion function : func_convert_path_X_to_Y ()
1796
- # where, for any given $build/$host combination the 'X_to_Y' value is the
1797
- # same. If conversion functions are added for new $build/$host combinations,
1798
- # the two new functions must follow this pattern, or func_init_to_host_path_cmd
1799
- # will break.
1800
-
1801
-
1802
- # func_init_to_host_path_cmd
1803
- # Ensures that function "pointer" variable $to_host_path_cmd is set to the
1804
- # appropriate value, based on the value of $to_host_file_cmd.
1805
- to_host_path_cmd=
1806
- func_init_to_host_path_cmd ()
1807
- {
1808
- $opt_debug
1809
- if test -z "$to_host_path_cmd"; then
1810
- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
1811
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
1812
- fi
1813
- }
1814
-
1815
-
1816
- # func_to_host_path ARG
1817
- # Converts the path ARG from $build format to $host format. Return result
1818
- # in func_to_host_path_result.
1819
- func_to_host_path ()
1820
- {
1821
- $opt_debug
1822
- func_init_to_host_path_cmd
1823
- $to_host_path_cmd "$1"
1824
- }
1825
- # end func_to_host_path
1826
-
1827
-
1828
- # func_convert_path_noop ARG
1829
- # Copy ARG to func_to_host_path_result.
1830
- func_convert_path_noop ()
1831
- {
1832
- func_to_host_path_result="$1"
1833
- }
1834
- # end func_convert_path_noop
1835
-
1836
-
1837
- # func_convert_path_msys_to_w32 ARG
1838
- # Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
1839
- # conversion to w32 is not available inside the cwrapper. Returns result in
1840
- # func_to_host_path_result.
1841
- func_convert_path_msys_to_w32 ()
1842
- {
1843
- $opt_debug
1844
- func_to_host_path_result="$1"
1845
- if test -n "$1"; then
1846
- # Remove leading and trailing path separator characters from ARG. MSYS
1847
- # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
1848
- # and winepath ignores them completely.
1849
- func_stripname : : "$1"
1850
- func_to_host_path_tmp1=$func_stripname_result
1851
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
1852
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
1853
- func_convert_path_check : ";" \
1854
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
1855
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1856
- fi
1857
- }
1858
- # end func_convert_path_msys_to_w32
1859
-
1860
-
1861
- # func_convert_path_cygwin_to_w32 ARG
1862
- # Convert path ARG from Cygwin to w32 format. Returns result in
1863
- # func_to_host_file_result.
1864
- func_convert_path_cygwin_to_w32 ()
1865
- {
1866
- $opt_debug
1867
- func_to_host_path_result="$1"
1868
- if test -n "$1"; then
1869
- # See func_convert_path_msys_to_w32:
1870
- func_stripname : : "$1"
1871
- func_to_host_path_tmp1=$func_stripname_result
1872
- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
1873
- func_convert_path_check : ";" \
1874
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
1875
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1876
- fi
1877
- }
1878
- # end func_convert_path_cygwin_to_w32
1879
-
1880
-
1881
- # func_convert_path_nix_to_w32 ARG
1882
- # Convert path ARG from *nix to w32 format. Requires a wine environment and
1883
- # a working winepath. Returns result in func_to_host_file_result.
1884
- func_convert_path_nix_to_w32 ()
1885
- {
1886
- $opt_debug
1887
- func_to_host_path_result="$1"
1888
- if test -n "$1"; then
1889
- # See func_convert_path_msys_to_w32:
1890
- func_stripname : : "$1"
1891
- func_to_host_path_tmp1=$func_stripname_result
1892
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
1893
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
1894
- func_convert_path_check : ";" \
1895
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
1896
- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
1897
- fi
1898
- }
1899
- # end func_convert_path_nix_to_w32
1241
+ if test "$build_old_libs" = yes; then
1242
+ write_oldobj=\'${3}\'
1243
+ else
1244
+ write_oldobj=none
1245
+ fi
1900
1246
 
1247
+ $opt_dry_run || {
1248
+ cat >${write_libobj}T <<EOF
1249
+ # $write_libobj - a libtool object file
1250
+ # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
1251
+ #
1252
+ # Please DO NOT delete this file!
1253
+ # It is necessary for linking the library.
1901
1254
 
1902
- # func_convert_path_msys_to_cygwin ARG
1903
- # Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
1904
- # Returns result in func_to_host_file_result.
1905
- func_convert_path_msys_to_cygwin ()
1906
- {
1907
- $opt_debug
1908
- func_to_host_path_result="$1"
1909
- if test -n "$1"; then
1910
- # See func_convert_path_msys_to_w32:
1911
- func_stripname : : "$1"
1912
- func_to_host_path_tmp1=$func_stripname_result
1913
- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
1914
- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
1915
- func_to_host_path_result="$func_cygpath_result"
1916
- func_convert_path_check : : \
1917
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
1918
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
1919
- fi
1920
- }
1921
- # end func_convert_path_msys_to_cygwin
1255
+ # Name of the PIC object.
1256
+ pic_object=$write_lobj
1922
1257
 
1258
+ # Name of the non-PIC object
1259
+ non_pic_object=$write_oldobj
1923
1260
 
1924
- # func_convert_path_nix_to_cygwin ARG
1925
- # Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
1926
- # a wine environment, working winepath, and LT_CYGPATH set. Returns result in
1927
- # func_to_host_file_result.
1928
- func_convert_path_nix_to_cygwin ()
1929
- {
1930
- $opt_debug
1931
- func_to_host_path_result="$1"
1932
- if test -n "$1"; then
1933
- # Remove leading and trailing path separator characters from
1934
- # ARG. msys behavior is inconsistent here, cygpath turns them
1935
- # into '.;' and ';.', and winepath ignores them completely.
1936
- func_stripname : : "$1"
1937
- func_to_host_path_tmp1=$func_stripname_result
1938
- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
1939
- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
1940
- func_to_host_path_result="$func_cygpath_result"
1941
- func_convert_path_check : : \
1942
- "$func_to_host_path_tmp1" "$func_to_host_path_result"
1943
- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
1944
- fi
1261
+ EOF
1262
+ $MV "${write_libobj}T" "${write_libobj}"
1263
+ }
1945
1264
  }
1946
- # end func_convert_path_nix_to_cygwin
1947
-
1948
1265
 
1949
1266
  # func_mode_compile arg...
1950
1267
  func_mode_compile ()
@@ -1986,12 +1303,12 @@ func_mode_compile ()
1986
1303
  ;;
1987
1304
 
1988
1305
  -pie | -fpie | -fPIE)
1989
- func_append pie_flag " $arg"
1306
+ pie_flag="$pie_flag $arg"
1990
1307
  continue
1991
1308
  ;;
1992
1309
 
1993
1310
  -shared | -static | -prefer-pic | -prefer-non-pic)
1994
- func_append later " $arg"
1311
+ later="$later $arg"
1995
1312
  continue
1996
1313
  ;;
1997
1314
 
@@ -2012,14 +1329,15 @@ func_mode_compile ()
2012
1329
  save_ifs="$IFS"; IFS=','
2013
1330
  for arg in $args; do
2014
1331
  IFS="$save_ifs"
2015
- func_append_quoted lastarg "$arg"
1332
+ func_quote_for_eval "$arg"
1333
+ lastarg="$lastarg $func_quote_for_eval_result"
2016
1334
  done
2017
1335
  IFS="$save_ifs"
2018
1336
  func_stripname ' ' '' "$lastarg"
2019
1337
  lastarg=$func_stripname_result
2020
1338
 
2021
1339
  # Add the arguments to base_compile.
2022
- func_append base_compile " $lastarg"
1340
+ base_compile="$base_compile $lastarg"
2023
1341
  continue
2024
1342
  ;;
2025
1343
 
@@ -2035,7 +1353,8 @@ func_mode_compile ()
2035
1353
  esac # case $arg_mode
2036
1354
 
2037
1355
  # Aesthetically quote the previous argument.
2038
- func_append_quoted base_compile "$lastarg"
1356
+ func_quote_for_eval "$lastarg"
1357
+ base_compile="$base_compile $func_quote_for_eval_result"
2039
1358
  done # for arg
2040
1359
 
2041
1360
  case $arg_mode in
@@ -2060,7 +1379,7 @@ func_mode_compile ()
2060
1379
  *.[cCFSifmso] | \
2061
1380
  *.ada | *.adb | *.ads | *.asm | \
2062
1381
  *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
2063
- *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
1382
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
2064
1383
  func_xform "$libobj"
2065
1384
  libobj=$func_xform_result
2066
1385
  ;;
@@ -2166,16 +1485,17 @@ compiler."
2166
1485
  $opt_dry_run || $RM $removelist
2167
1486
  exit $EXIT_FAILURE
2168
1487
  fi
2169
- func_append removelist " $output_obj"
1488
+ removelist="$removelist $output_obj"
2170
1489
  $ECHO "$srcfile" > "$lockfile"
2171
1490
  fi
2172
1491
 
2173
1492
  $opt_dry_run || $RM $removelist
2174
- func_append removelist " $lockfile"
1493
+ removelist="$removelist $lockfile"
2175
1494
  trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
2176
1495
 
2177
- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
2178
- srcfile=$func_to_tool_file_result
1496
+ if test -n "$fix_srcfile_path"; then
1497
+ eval srcfile=\"$fix_srcfile_path\"
1498
+ fi
2179
1499
  func_quote_for_eval "$srcfile"
2180
1500
  qsrcfile=$func_quote_for_eval_result
2181
1501
 
@@ -2195,7 +1515,7 @@ compiler."
2195
1515
 
2196
1516
  if test -z "$output_obj"; then
2197
1517
  # Place PIC objects in $objdir
2198
- func_append command " -o $lobj"
1518
+ command="$command -o $lobj"
2199
1519
  fi
2200
1520
 
2201
1521
  func_show_eval_locale "$command" \
@@ -2242,11 +1562,11 @@ compiler."
2242
1562
  command="$base_compile $qsrcfile $pic_flag"
2243
1563
  fi
2244
1564
  if test "$compiler_c_o" = yes; then
2245
- func_append command " -o $obj"
1565
+ command="$command -o $obj"
2246
1566
  fi
2247
1567
 
2248
1568
  # Suppress compiler output if we already did a PIC compilation.
2249
- func_append command "$suppress_output"
1569
+ command="$command$suppress_output"
2250
1570
  func_show_eval_locale "$command" \
2251
1571
  '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
2252
1572
 
@@ -2291,13 +1611,13 @@ compiler."
2291
1611
  }
2292
1612
 
2293
1613
  $opt_help || {
2294
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
1614
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
2295
1615
  }
2296
1616
 
2297
1617
  func_mode_help ()
2298
1618
  {
2299
1619
  # We need to display help for each of the modes.
2300
- case $opt_mode in
1620
+ case $mode in
2301
1621
  "")
2302
1622
  # Generic help is extracted from the usage comments
2303
1623
  # at the start of this file.
@@ -2473,7 +1793,7 @@ Otherwise, only FILE itself is deleted using RM."
2473
1793
  ;;
2474
1794
 
2475
1795
  *)
2476
- func_fatal_help "invalid operation mode \`$opt_mode'"
1796
+ func_fatal_help "invalid operation mode \`$mode'"
2477
1797
  ;;
2478
1798
  esac
2479
1799
 
@@ -2488,13 +1808,13 @@ if $opt_help; then
2488
1808
  else
2489
1809
  {
2490
1810
  func_help noexit
2491
- for opt_mode in compile link execute install finish uninstall clean; do
1811
+ for mode in compile link execute install finish uninstall clean; do
2492
1812
  func_mode_help
2493
1813
  done
2494
1814
  } | sed -n '1p; 2,$s/^Usage:/ or: /p'
2495
1815
  {
2496
1816
  func_help noexit
2497
- for opt_mode in compile link execute install finish uninstall clean; do
1817
+ for mode in compile link execute install finish uninstall clean; do
2498
1818
  echo
2499
1819
  func_mode_help
2500
1820
  done
@@ -2523,16 +1843,13 @@ func_mode_execute ()
2523
1843
  func_fatal_help "you must specify a COMMAND"
2524
1844
 
2525
1845
  # Handle -dlopen flags immediately.
2526
- for file in $opt_dlopen; do
1846
+ for file in $execute_dlfiles; do
2527
1847
  test -f "$file" \
2528
1848
  || func_fatal_help "\`$file' is not a file"
2529
1849
 
2530
1850
  dir=
2531
1851
  case $file in
2532
1852
  *.la)
2533
- func_resolve_sysroot "$file"
2534
- file=$func_resolve_sysroot_result
2535
-
2536
1853
  # Check to see that this really is a libtool archive.
2537
1854
  func_lalib_unsafe_p "$file" \
2538
1855
  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -2554,7 +1871,7 @@ func_mode_execute ()
2554
1871
  dir="$func_dirname_result"
2555
1872
 
2556
1873
  if test -f "$dir/$objdir/$dlname"; then
2557
- func_append dir "/$objdir"
1874
+ dir="$dir/$objdir"
2558
1875
  else
2559
1876
  if test ! -f "$dir/$dlname"; then
2560
1877
  func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -2611,7 +1928,8 @@ func_mode_execute ()
2611
1928
  ;;
2612
1929
  esac
2613
1930
  # Quote arguments (to preserve shell metacharacters).
2614
- func_append_quoted args "$file"
1931
+ func_quote_for_eval "$file"
1932
+ args="$args $func_quote_for_eval_result"
2615
1933
  done
2616
1934
 
2617
1935
  if test "X$opt_dry_run" = Xfalse; then
@@ -2643,59 +1961,22 @@ func_mode_execute ()
2643
1961
  fi
2644
1962
  }
2645
1963
 
2646
- test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
1964
+ test "$mode" = execute && func_mode_execute ${1+"$@"}
2647
1965
 
2648
1966
 
2649
1967
  # func_mode_finish arg...
2650
1968
  func_mode_finish ()
2651
1969
  {
2652
1970
  $opt_debug
2653
- libs=
2654
- libdirs=
1971
+ libdirs="$nonopt"
2655
1972
  admincmds=
2656
1973
 
2657
- for opt in "$nonopt" ${1+"$@"}
2658
- do
2659
- if test -d "$opt"; then
2660
- func_append libdirs " $opt"
2661
-
2662
- elif test -f "$opt"; then
2663
- if func_lalib_unsafe_p "$opt"; then
2664
- func_append libs " $opt"
2665
- else
2666
- func_warning "\`$opt' is not a valid libtool archive"
2667
- fi
2668
-
2669
- else
2670
- func_fatal_error "invalid argument \`$opt'"
2671
- fi
2672
- done
2673
-
2674
- if test -n "$libs"; then
2675
- if test -n "$lt_sysroot"; then
2676
- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
2677
- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
2678
- else
2679
- sysroot_cmd=
2680
- fi
2681
-
2682
- # Remove sysroot references
2683
- if $opt_dry_run; then
2684
- for lib in $libs; do
2685
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
2686
- done
2687
- else
2688
- tmpdir=`func_mktempdir`
2689
- for lib in $libs; do
2690
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
2691
- > $tmpdir/tmp-la
2692
- mv -f $tmpdir/tmp-la $lib
2693
- done
2694
- ${RM}r "$tmpdir"
2695
- fi
2696
- fi
2697
-
2698
1974
  if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
1975
+ for dir
1976
+ do
1977
+ libdirs="$libdirs $dir"
1978
+ done
1979
+
2699
1980
  for libdir in $libdirs; do
2700
1981
  if test -n "$finish_cmds"; then
2701
1982
  # Do each command in the finish commands.
@@ -2705,7 +1986,7 @@ func_mode_finish ()
2705
1986
  if test -n "$finish_eval"; then
2706
1987
  # Do the single finish_eval.
2707
1988
  eval cmds=\"$finish_eval\"
2708
- $opt_dry_run || eval "$cmds" || func_append admincmds "
1989
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
2709
1990
  $cmds"
2710
1991
  fi
2711
1992
  done
@@ -2714,55 +1995,53 @@ func_mode_finish ()
2714
1995
  # Exit here if they wanted silent mode.
2715
1996
  $opt_silent && exit $EXIT_SUCCESS
2716
1997
 
2717
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
2718
- echo "----------------------------------------------------------------------"
2719
- echo "Libraries have been installed in:"
2720
- for libdir in $libdirs; do
2721
- $ECHO " $libdir"
2722
- done
2723
- echo
2724
- echo "If you ever happen to want to link against installed libraries"
2725
- echo "in a given directory, LIBDIR, you must either use libtool, and"
2726
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
2727
- echo "flag during linking and do at least one of the following:"
2728
- if test -n "$shlibpath_var"; then
2729
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
2730
- echo " during execution"
2731
- fi
2732
- if test -n "$runpath_var"; then
2733
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
2734
- echo " during linking"
2735
- fi
2736
- if test -n "$hardcode_libdir_flag_spec"; then
2737
- libdir=LIBDIR
2738
- eval flag=\"$hardcode_libdir_flag_spec\"
2739
-
2740
- $ECHO " - use the \`$flag' linker flag"
2741
- fi
2742
- if test -n "$admincmds"; then
2743
- $ECHO " - have your system administrator run these commands:$admincmds"
2744
- fi
2745
- if test -f /etc/ld.so.conf; then
2746
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
2747
- fi
2748
- echo
1998
+ echo "----------------------------------------------------------------------"
1999
+ echo "Libraries have been installed in:"
2000
+ for libdir in $libdirs; do
2001
+ $ECHO " $libdir"
2002
+ done
2003
+ echo
2004
+ echo "If you ever happen to want to link against installed libraries"
2005
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
2006
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
2007
+ echo "flag during linking and do at least one of the following:"
2008
+ if test -n "$shlibpath_var"; then
2009
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
2010
+ echo " during execution"
2011
+ fi
2012
+ if test -n "$runpath_var"; then
2013
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
2014
+ echo " during linking"
2015
+ fi
2016
+ if test -n "$hardcode_libdir_flag_spec"; then
2017
+ libdir=LIBDIR
2018
+ eval flag=\"$hardcode_libdir_flag_spec\"
2749
2019
 
2750
- echo "See any operating system documentation about shared libraries for"
2751
- case $host in
2752
- solaris2.[6789]|solaris2.1[0-9])
2753
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
2754
- echo "pages."
2755
- ;;
2756
- *)
2757
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
2758
- ;;
2759
- esac
2760
- echo "----------------------------------------------------------------------"
2020
+ $ECHO " - use the \`$flag' linker flag"
2021
+ fi
2022
+ if test -n "$admincmds"; then
2023
+ $ECHO " - have your system administrator run these commands:$admincmds"
2761
2024
  fi
2025
+ if test -f /etc/ld.so.conf; then
2026
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
2027
+ fi
2028
+ echo
2029
+
2030
+ echo "See any operating system documentation about shared libraries for"
2031
+ case $host in
2032
+ solaris2.[6789]|solaris2.1[0-9])
2033
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
2034
+ echo "pages."
2035
+ ;;
2036
+ *)
2037
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
2038
+ ;;
2039
+ esac
2040
+ echo "----------------------------------------------------------------------"
2762
2041
  exit $EXIT_SUCCESS
2763
2042
  }
2764
2043
 
2765
- test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
2044
+ test "$mode" = finish && func_mode_finish ${1+"$@"}
2766
2045
 
2767
2046
 
2768
2047
  # func_mode_install arg...
@@ -2787,7 +2066,7 @@ func_mode_install ()
2787
2066
  # The real first argument should be the name of the installation program.
2788
2067
  # Aesthetically quote it.
2789
2068
  func_quote_for_eval "$arg"
2790
- func_append install_prog "$func_quote_for_eval_result"
2069
+ install_prog="$install_prog$func_quote_for_eval_result"
2791
2070
  install_shared_prog=$install_prog
2792
2071
  case " $install_prog " in
2793
2072
  *[\\\ /]cp\ *) install_cp=: ;;
@@ -2807,7 +2086,7 @@ func_mode_install ()
2807
2086
  do
2808
2087
  arg2=
2809
2088
  if test -n "$dest"; then
2810
- func_append files " $dest"
2089
+ files="$files $dest"
2811
2090
  dest=$arg
2812
2091
  continue
2813
2092
  fi
@@ -2845,11 +2124,11 @@ func_mode_install ()
2845
2124
 
2846
2125
  # Aesthetically quote the argument.
2847
2126
  func_quote_for_eval "$arg"
2848
- func_append install_prog " $func_quote_for_eval_result"
2127
+ install_prog="$install_prog $func_quote_for_eval_result"
2849
2128
  if test -n "$arg2"; then
2850
2129
  func_quote_for_eval "$arg2"
2851
2130
  fi
2852
- func_append install_shared_prog " $func_quote_for_eval_result"
2131
+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
2853
2132
  done
2854
2133
 
2855
2134
  test -z "$install_prog" && \
@@ -2861,7 +2140,7 @@ func_mode_install ()
2861
2140
  if test -n "$install_override_mode" && $no_mode; then
2862
2141
  if $install_cp; then :; else
2863
2142
  func_quote_for_eval "$install_override_mode"
2864
- func_append install_shared_prog " -m $func_quote_for_eval_result"
2143
+ install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
2865
2144
  fi
2866
2145
  fi
2867
2146
 
@@ -2919,13 +2198,10 @@ func_mode_install ()
2919
2198
  case $file in
2920
2199
  *.$libext)
2921
2200
  # Do the static libraries later.
2922
- func_append staticlibs " $file"
2201
+ staticlibs="$staticlibs $file"
2923
2202
  ;;
2924
2203
 
2925
2204
  *.la)
2926
- func_resolve_sysroot "$file"
2927
- file=$func_resolve_sysroot_result
2928
-
2929
2205
  # Check to see that this really is a libtool archive.
2930
2206
  func_lalib_unsafe_p "$file" \
2931
2207
  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2939,19 +2215,19 @@ func_mode_install ()
2939
2215
  if test "X$destdir" = "X$libdir"; then
2940
2216
  case "$current_libdirs " in
2941
2217
  *" $libdir "*) ;;
2942
- *) func_append current_libdirs " $libdir" ;;
2218
+ *) current_libdirs="$current_libdirs $libdir" ;;
2943
2219
  esac
2944
2220
  else
2945
2221
  # Note the libdir as a future libdir.
2946
2222
  case "$future_libdirs " in
2947
2223
  *" $libdir "*) ;;
2948
- *) func_append future_libdirs " $libdir" ;;
2224
+ *) future_libdirs="$future_libdirs $libdir" ;;
2949
2225
  esac
2950
2226
  fi
2951
2227
 
2952
2228
  func_dirname "$file" "/" ""
2953
2229
  dir="$func_dirname_result"
2954
- func_append dir "$objdir"
2230
+ dir="$dir$objdir"
2955
2231
 
2956
2232
  if test -n "$relink_command"; then
2957
2233
  # Determine the prefix the user has applied to our future dir.
@@ -3028,7 +2304,7 @@ func_mode_install ()
3028
2304
  func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
3029
2305
 
3030
2306
  # Maybe install the static library, too.
3031
- test -n "$old_library" && func_append staticlibs " $dir/$old_library"
2307
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
3032
2308
  ;;
3033
2309
 
3034
2310
  *.lo)
@@ -3202,13 +2478,11 @@ func_mode_install ()
3202
2478
 
3203
2479
  # Set up the ranlib parameters.
3204
2480
  oldlib="$destdir/$name"
3205
- func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
3206
- tool_oldlib=$func_to_tool_file_result
3207
2481
 
3208
2482
  func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
3209
2483
 
3210
2484
  if test -n "$stripme" && test -n "$old_striplib"; then
3211
- func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
2485
+ func_show_eval "$old_striplib $oldlib" 'exit $?'
3212
2486
  fi
3213
2487
 
3214
2488
  # Do each command in the postinstall commands.
@@ -3227,7 +2501,7 @@ func_mode_install ()
3227
2501
  fi
3228
2502
  }
3229
2503
 
3230
- test "$opt_mode" = install && func_mode_install ${1+"$@"}
2504
+ test "$mode" = install && func_mode_install ${1+"$@"}
3231
2505
 
3232
2506
 
3233
2507
  # func_generate_dlsyms outputname originator pic_p
@@ -3274,18 +2548,6 @@ extern \"C\" {
3274
2548
  #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
3275
2549
  #endif
3276
2550
 
3277
- /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
3278
- #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3279
- /* DATA imports from DLLs on WIN32 con't be const, because runtime
3280
- relocations are performed -- see ld's documentation on pseudo-relocs. */
3281
- # define LT_DLSYM_CONST
3282
- #elif defined(__osf__)
3283
- /* This system does not cope well with relocations in const data. */
3284
- # define LT_DLSYM_CONST
3285
- #else
3286
- # define LT_DLSYM_CONST const
3287
- #endif
3288
-
3289
2551
  /* External symbol declarations for the compiler. */\
3290
2552
  "
3291
2553
 
@@ -3297,9 +2559,8 @@ extern \"C\" {
3297
2559
  # Add our own program objects to the symbol list.
3298
2560
  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
3299
2561
  for progfile in $progfiles; do
3300
- func_to_tool_file "$progfile" func_convert_file_msys_to_w32
3301
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
3302
- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
2562
+ func_verbose "extracting global C symbols from \`$progfile'"
2563
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
3303
2564
  done
3304
2565
 
3305
2566
  if test -n "$exclude_expsyms"; then
@@ -3348,52 +2609,10 @@ extern \"C\" {
3348
2609
  func_verbose "extracting global C symbols from \`$dlprefile'"
3349
2610
  func_basename "$dlprefile"
3350
2611
  name="$func_basename_result"
3351
- case $host in
3352
- *cygwin* | *mingw* | *cegcc* )
3353
- # if an import library, we need to obtain dlname
3354
- if func_win32_import_lib_p "$dlprefile"; then
3355
- func_tr_sh "$dlprefile"
3356
- eval "curr_lafile=\$libfile_$func_tr_sh_result"
3357
- dlprefile_dlbasename=""
3358
- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
3359
- # Use subshell, to avoid clobbering current variable values
3360
- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
3361
- if test -n "$dlprefile_dlname" ; then
3362
- func_basename "$dlprefile_dlname"
3363
- dlprefile_dlbasename="$func_basename_result"
3364
- else
3365
- # no lafile. user explicitly requested -dlpreopen <import library>.
3366
- $sharedlib_from_linklib_cmd "$dlprefile"
3367
- dlprefile_dlbasename=$sharedlib_from_linklib_result
3368
- fi
3369
- fi
3370
- $opt_dry_run || {
3371
- if test -n "$dlprefile_dlbasename" ; then
3372
- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
3373
- else
3374
- func_warning "Could not compute DLL name from $name"
3375
- eval '$ECHO ": $name " >> "$nlist"'
3376
- fi
3377
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3378
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
3379
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
3380
- }
3381
- else # not an import lib
3382
- $opt_dry_run || {
3383
- eval '$ECHO ": $name " >> "$nlist"'
3384
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3385
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3386
- }
3387
- fi
3388
- ;;
3389
- *)
3390
- $opt_dry_run || {
3391
- eval '$ECHO ": $name " >> "$nlist"'
3392
- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
3393
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
3394
- }
3395
- ;;
3396
- esac
2612
+ $opt_dry_run || {
2613
+ eval '$ECHO ": $name " >> "$nlist"'
2614
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
2615
+ }
3397
2616
  done
3398
2617
 
3399
2618
  $opt_dry_run || {
@@ -3431,9 +2650,26 @@ typedef struct {
3431
2650
  const char *name;
3432
2651
  void *address;
3433
2652
  } lt_dlsymlist;
3434
- extern LT_DLSYM_CONST lt_dlsymlist
2653
+ "
2654
+ case $host in
2655
+ *cygwin* | *mingw* | *cegcc* )
2656
+ echo >> "$output_objdir/$my_dlsyms" "\
2657
+ /* DATA imports from DLLs on WIN32 con't be const, because
2658
+ runtime relocations are performed -- see ld's documentation
2659
+ on pseudo-relocs. */"
2660
+ lt_dlsym_const= ;;
2661
+ *osf5*)
2662
+ echo >> "$output_objdir/$my_dlsyms" "\
2663
+ /* This system does not cope well with relocations in const data */"
2664
+ lt_dlsym_const= ;;
2665
+ *)
2666
+ lt_dlsym_const=const ;;
2667
+ esac
2668
+
2669
+ echo >> "$output_objdir/$my_dlsyms" "\
2670
+ extern $lt_dlsym_const lt_dlsymlist
3435
2671
  lt_${my_prefix}_LTX_preloaded_symbols[];
3436
- LT_DLSYM_CONST lt_dlsymlist
2672
+ $lt_dlsym_const lt_dlsymlist
3437
2673
  lt_${my_prefix}_LTX_preloaded_symbols[] =
3438
2674
  {\
3439
2675
  { \"$my_originator\", (void *) 0 },"
@@ -3473,7 +2709,7 @@ static const void *lt_preloaded_setup() {
3473
2709
  # linked before any other PIC object. But we must not use
3474
2710
  # pic_flag when linking with -static. The problem exists in
3475
2711
  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
3476
- *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
2712
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
3477
2713
  pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
3478
2714
  *-*-hpux*)
3479
2715
  pic_flag_for_symtable=" $pic_flag" ;;
@@ -3489,7 +2725,7 @@ static const void *lt_preloaded_setup() {
3489
2725
  for arg in $LTCFLAGS; do
3490
2726
  case $arg in
3491
2727
  -pie | -fpie | -fPIE) ;;
3492
- *) func_append symtab_cflags " $arg" ;;
2728
+ *) symtab_cflags="$symtab_cflags $arg" ;;
3493
2729
  esac
3494
2730
  done
3495
2731
 
@@ -3552,8 +2788,7 @@ func_win32_libid ()
3552
2788
  # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
3553
2789
  if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
3554
2790
  $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
3555
- func_to_tool_file "$1" func_convert_file_msys_to_w32
3556
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
2791
+ win32_nmres=`eval $NM -f posix -A $1 |
3557
2792
  $SED -n -e '
3558
2793
  1,100{
3559
2794
  / I /{
@@ -3582,131 +2817,6 @@ func_win32_libid ()
3582
2817
  $ECHO "$win32_libid_type"
3583
2818
  }
3584
2819
 
3585
- # func_cygming_dll_for_implib ARG
3586
- #
3587
- # Platform-specific function to extract the
3588
- # name of the DLL associated with the specified
3589
- # import library ARG.
3590
- # Invoked by eval'ing the libtool variable
3591
- # $sharedlib_from_linklib_cmd
3592
- # Result is available in the variable
3593
- # $sharedlib_from_linklib_result
3594
- func_cygming_dll_for_implib ()
3595
- {
3596
- $opt_debug
3597
- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
3598
- }
3599
-
3600
- # func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
3601
- #
3602
- # The is the core of a fallback implementation of a
3603
- # platform-specific function to extract the name of the
3604
- # DLL associated with the specified import library LIBNAME.
3605
- #
3606
- # SECTION_NAME is either .idata$6 or .idata$7, depending
3607
- # on the platform and compiler that created the implib.
3608
- #
3609
- # Echos the name of the DLL associated with the
3610
- # specified import library.
3611
- func_cygming_dll_for_implib_fallback_core ()
3612
- {
3613
- $opt_debug
3614
- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
3615
- $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
3616
- $SED '/^Contents of section '"$match_literal"':/{
3617
- # Place marker at beginning of archive member dllname section
3618
- s/.*/====MARK====/
3619
- p
3620
- d
3621
- }
3622
- # These lines can sometimes be longer than 43 characters, but
3623
- # are always uninteresting
3624
- /:[ ]*file format pe[i]\{,1\}-/d
3625
- /^In archive [^:]*:/d
3626
- # Ensure marker is printed
3627
- /^====MARK====/p
3628
- # Remove all lines with less than 43 characters
3629
- /^.\{43\}/!d
3630
- # From remaining lines, remove first 43 characters
3631
- s/^.\{43\}//' |
3632
- $SED -n '
3633
- # Join marker and all lines until next marker into a single line
3634
- /^====MARK====/ b para
3635
- H
3636
- $ b para
3637
- b
3638
- :para
3639
- x
3640
- s/\n//g
3641
- # Remove the marker
3642
- s/^====MARK====//
3643
- # Remove trailing dots and whitespace
3644
- s/[\. \t]*$//
3645
- # Print
3646
- /./p' |
3647
- # we now have a list, one entry per line, of the stringified
3648
- # contents of the appropriate section of all members of the
3649
- # archive which possess that section. Heuristic: eliminate
3650
- # all those which have a first or second character that is
3651
- # a '.' (that is, objdump's representation of an unprintable
3652
- # character.) This should work for all archives with less than
3653
- # 0x302f exports -- but will fail for DLLs whose name actually
3654
- # begins with a literal '.' or a single character followed by
3655
- # a '.'.
3656
- #
3657
- # Of those that remain, print the first one.
3658
- $SED -e '/^\./d;/^.\./d;q'
3659
- }
3660
-
3661
- # func_cygming_gnu_implib_p ARG
3662
- # This predicate returns with zero status (TRUE) if
3663
- # ARG is a GNU/binutils-style import library. Returns
3664
- # with nonzero status (FALSE) otherwise.
3665
- func_cygming_gnu_implib_p ()
3666
- {
3667
- $opt_debug
3668
- func_to_tool_file "$1" func_convert_file_msys_to_w32
3669
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
3670
- test -n "$func_cygming_gnu_implib_tmp"
3671
- }
3672
-
3673
- # func_cygming_ms_implib_p ARG
3674
- # This predicate returns with zero status (TRUE) if
3675
- # ARG is an MS-style import library. Returns
3676
- # with nonzero status (FALSE) otherwise.
3677
- func_cygming_ms_implib_p ()
3678
- {
3679
- $opt_debug
3680
- func_to_tool_file "$1" func_convert_file_msys_to_w32
3681
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
3682
- test -n "$func_cygming_ms_implib_tmp"
3683
- }
3684
-
3685
- # func_cygming_dll_for_implib_fallback ARG
3686
- # Platform-specific function to extract the
3687
- # name of the DLL associated with the specified
3688
- # import library ARG.
3689
- #
3690
- # This fallback implementation is for use when $DLLTOOL
3691
- # does not support the --identify-strict option.
3692
- # Invoked by eval'ing the libtool variable
3693
- # $sharedlib_from_linklib_cmd
3694
- # Result is available in the variable
3695
- # $sharedlib_from_linklib_result
3696
- func_cygming_dll_for_implib_fallback ()
3697
- {
3698
- $opt_debug
3699
- if func_cygming_gnu_implib_p "$1" ; then
3700
- # binutils import library
3701
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
3702
- elif func_cygming_ms_implib_p "$1" ; then
3703
- # ms-generated import library
3704
- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
3705
- else
3706
- # unknown
3707
- sharedlib_from_linklib_result=""
3708
- fi
3709
- }
3710
2820
 
3711
2821
 
3712
2822
  # func_extract_an_archive dir oldlib
@@ -3985,17 +3095,14 @@ func_exec_program_core ()
3985
3095
  # launches target application with the remaining arguments.
3986
3096
  func_exec_program ()
3987
3097
  {
3988
- case \" \$* \" in
3989
- *\\ --lt-*)
3990
- for lt_wr_arg
3991
- do
3992
- case \$lt_wr_arg in
3993
- --lt-*) ;;
3994
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3995
- esac
3996
- shift
3997
- done ;;
3998
- esac
3098
+ for lt_wr_arg
3099
+ do
3100
+ case \$lt_wr_arg in
3101
+ --lt-*) ;;
3102
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3103
+ esac
3104
+ shift
3105
+ done
3999
3106
  func_exec_program_core \${1+\"\$@\"}
4000
3107
  }
4001
3108
 
@@ -4088,18 +3195,6 @@ func_exec_program ()
4088
3195
 
4089
3196
  if test -f \"\$progdir/\$program\"; then"
4090
3197
 
4091
- # fixup the dll searchpath if we need to.
4092
- #
4093
- # Fix the DLL searchpath if we need to. Do this before prepending
4094
- # to shlibpath, because on Windows, both are PATH and uninstalled
4095
- # libraries must come first.
4096
- if test -n "$dllsearchpath"; then
4097
- $ECHO "\
4098
- # Add the dll search path components to the executable PATH
4099
- PATH=$dllsearchpath:\$PATH
4100
- "
4101
- fi
4102
-
4103
3198
  # Export our shlibpath_var if we have one.
4104
3199
  if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4105
3200
  $ECHO "\
@@ -4114,6 +3209,14 @@ func_exec_program ()
4114
3209
  "
4115
3210
  fi
4116
3211
 
3212
+ # fixup the dll searchpath if we need to.
3213
+ if test -n "$dllsearchpath"; then
3214
+ $ECHO "\
3215
+ # Add the dll search path components to the executable PATH
3216
+ PATH=$dllsearchpath:\$PATH
3217
+ "
3218
+ fi
3219
+
4117
3220
  $ECHO "\
4118
3221
  if test \"\$libtool_execute_magic\" != \"$magic\"; then
4119
3222
  # Run the actual program with our arguments.
@@ -4131,6 +3234,166 @@ fi\
4131
3234
  }
4132
3235
 
4133
3236
 
3237
+ # func_to_host_path arg
3238
+ #
3239
+ # Convert paths to host format when used with build tools.
3240
+ # Intended for use with "native" mingw (where libtool itself
3241
+ # is running under the msys shell), or in the following cross-
3242
+ # build environments:
3243
+ # $build $host
3244
+ # mingw (msys) mingw [e.g. native]
3245
+ # cygwin mingw
3246
+ # *nix + wine mingw
3247
+ # where wine is equipped with the `winepath' executable.
3248
+ # In the native mingw case, the (msys) shell automatically
3249
+ # converts paths for any non-msys applications it launches,
3250
+ # but that facility isn't available from inside the cwrapper.
3251
+ # Similar accommodations are necessary for $host mingw and
3252
+ # $build cygwin. Calling this function does no harm for other
3253
+ # $host/$build combinations not listed above.
3254
+ #
3255
+ # ARG is the path (on $build) that should be converted to
3256
+ # the proper representation for $host. The result is stored
3257
+ # in $func_to_host_path_result.
3258
+ func_to_host_path ()
3259
+ {
3260
+ func_to_host_path_result="$1"
3261
+ if test -n "$1"; then
3262
+ case $host in
3263
+ *mingw* )
3264
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
3265
+ case $build in
3266
+ *mingw* ) # actually, msys
3267
+ # awkward: cmd appends spaces to result
3268
+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
3269
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
3270
+ ;;
3271
+ *cygwin* )
3272
+ func_to_host_path_result=`cygpath -w "$1" |
3273
+ $SED -e "$lt_sed_naive_backslashify"`
3274
+ ;;
3275
+ * )
3276
+ # Unfortunately, winepath does not exit with a non-zero
3277
+ # error code, so we are forced to check the contents of
3278
+ # stdout. On the other hand, if the command is not
3279
+ # found, the shell will set an exit code of 127 and print
3280
+ # *an error message* to stdout. So we must check for both
3281
+ # error code of zero AND non-empty stdout, which explains
3282
+ # the odd construction:
3283
+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
3284
+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
3285
+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
3286
+ $SED -e "$lt_sed_naive_backslashify"`
3287
+ else
3288
+ # Allow warning below.
3289
+ func_to_host_path_result=
3290
+ fi
3291
+ ;;
3292
+ esac
3293
+ if test -z "$func_to_host_path_result" ; then
3294
+ func_error "Could not determine host path corresponding to"
3295
+ func_error " \`$1'"
3296
+ func_error "Continuing, but uninstalled executables may not work."
3297
+ # Fallback:
3298
+ func_to_host_path_result="$1"
3299
+ fi
3300
+ ;;
3301
+ esac
3302
+ fi
3303
+ }
3304
+ # end: func_to_host_path
3305
+
3306
+ # func_to_host_pathlist arg
3307
+ #
3308
+ # Convert pathlists to host format when used with build tools.
3309
+ # See func_to_host_path(), above. This function supports the
3310
+ # following $build/$host combinations (but does no harm for
3311
+ # combinations not listed here):
3312
+ # $build $host
3313
+ # mingw (msys) mingw [e.g. native]
3314
+ # cygwin mingw
3315
+ # *nix + wine mingw
3316
+ #
3317
+ # Path separators are also converted from $build format to
3318
+ # $host format. If ARG begins or ends with a path separator
3319
+ # character, it is preserved (but converted to $host format)
3320
+ # on output.
3321
+ #
3322
+ # ARG is a pathlist (on $build) that should be converted to
3323
+ # the proper representation on $host. The result is stored
3324
+ # in $func_to_host_pathlist_result.
3325
+ func_to_host_pathlist ()
3326
+ {
3327
+ func_to_host_pathlist_result="$1"
3328
+ if test -n "$1"; then
3329
+ case $host in
3330
+ *mingw* )
3331
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
3332
+ # Remove leading and trailing path separator characters from
3333
+ # ARG. msys behavior is inconsistent here, cygpath turns them
3334
+ # into '.;' and ';.', and winepath ignores them completely.
3335
+ func_stripname : : "$1"
3336
+ func_to_host_pathlist_tmp1=$func_stripname_result
3337
+ case $build in
3338
+ *mingw* ) # Actually, msys.
3339
+ # Awkward: cmd appends spaces to result.
3340
+ func_to_host_pathlist_result=`
3341
+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
3342
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
3343
+ ;;
3344
+ *cygwin* )
3345
+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
3346
+ $SED -e "$lt_sed_naive_backslashify"`
3347
+ ;;
3348
+ * )
3349
+ # unfortunately, winepath doesn't convert pathlists
3350
+ func_to_host_pathlist_result=""
3351
+ func_to_host_pathlist_oldIFS=$IFS
3352
+ IFS=:
3353
+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
3354
+ IFS=$func_to_host_pathlist_oldIFS
3355
+ if test -n "$func_to_host_pathlist_f" ; then
3356
+ func_to_host_path "$func_to_host_pathlist_f"
3357
+ if test -n "$func_to_host_path_result" ; then
3358
+ if test -z "$func_to_host_pathlist_result" ; then
3359
+ func_to_host_pathlist_result="$func_to_host_path_result"
3360
+ else
3361
+ func_append func_to_host_pathlist_result ";$func_to_host_path_result"
3362
+ fi
3363
+ fi
3364
+ fi
3365
+ done
3366
+ IFS=$func_to_host_pathlist_oldIFS
3367
+ ;;
3368
+ esac
3369
+ if test -z "$func_to_host_pathlist_result"; then
3370
+ func_error "Could not determine the host path(s) corresponding to"
3371
+ func_error " \`$1'"
3372
+ func_error "Continuing, but uninstalled executables may not work."
3373
+ # Fallback. This may break if $1 contains DOS-style drive
3374
+ # specifications. The fix is not to complicate the expression
3375
+ # below, but for the user to provide a working wine installation
3376
+ # with winepath so that path translation in the cross-to-mingw
3377
+ # case works properly.
3378
+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
3379
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
3380
+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
3381
+ fi
3382
+ # Now, add the leading and trailing path separators back
3383
+ case "$1" in
3384
+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
3385
+ ;;
3386
+ esac
3387
+ case "$1" in
3388
+ *: ) func_append func_to_host_pathlist_result ";"
3389
+ ;;
3390
+ esac
3391
+ ;;
3392
+ esac
3393
+ fi
3394
+ }
3395
+ # end: func_to_host_pathlist
3396
+
4134
3397
  # func_emit_cwrapperexe_src
4135
3398
  # emit the source code for a wrapper executable on stdout
4136
3399
  # Must ONLY be called from within func_mode_link because
@@ -4300,14 +3563,14 @@ void lt_dump_script (FILE *f);
4300
3563
  EOF
4301
3564
 
4302
3565
  cat <<EOF
4303
- volatile const char * MAGIC_EXE = "$magic_exe";
3566
+ const char * MAGIC_EXE = "$magic_exe";
4304
3567
  const char * LIB_PATH_VARNAME = "$shlibpath_var";
4305
3568
  EOF
4306
3569
 
4307
3570
  if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
4308
- func_to_host_path "$temp_rpath"
3571
+ func_to_host_pathlist "$temp_rpath"
4309
3572
  cat <<EOF
4310
- const char * LIB_PATH_VALUE = "$func_to_host_path_result";
3573
+ const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
4311
3574
  EOF
4312
3575
  else
4313
3576
  cat <<"EOF"
@@ -4316,10 +3579,10 @@ EOF
4316
3579
  fi
4317
3580
 
4318
3581
  if test -n "$dllsearchpath"; then
4319
- func_to_host_path "$dllsearchpath:"
3582
+ func_to_host_pathlist "$dllsearchpath:"
4320
3583
  cat <<EOF
4321
3584
  const char * EXE_PATH_VARNAME = "PATH";
4322
- const char * EXE_PATH_VALUE = "$func_to_host_path_result";
3585
+ const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
4323
3586
  EOF
4324
3587
  else
4325
3588
  cat <<"EOF"
@@ -4502,12 +3765,8 @@ EOF
4502
3765
 
4503
3766
  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
4504
3767
  lt_setenv ("DUALCASE", "1"); /* for MSK sh */
4505
- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
4506
- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
4507
- because on Windows, both *_VARNAMEs are PATH but uninstalled
4508
- libraries must come first. */
4509
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4510
3768
  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
3769
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
4511
3770
 
4512
3771
  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
4513
3772
  nonnull (lt_argv_zero));
@@ -5063,15 +4322,9 @@ void lt_dump_script (FILE* f)
5063
4322
  {
5064
4323
  EOF
5065
4324
  func_emit_wrapper yes |
5066
- $SED -n -e '
5067
- s/^\(.\{79\}\)\(..*\)/\1\
5068
- \2/
5069
- h
5070
- s/\([\\"]\)/\\\1/g
5071
- s/$/\\n/
5072
- s/\([^\n]*\).*/ fputs ("\1", f);/p
5073
- g
5074
- D'
4325
+ $SED -e 's/\([\\"]\)/\\\1/g' \
4326
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
4327
+
5075
4328
  cat <<"EOF"
5076
4329
  }
5077
4330
  EOF
@@ -5262,9 +4515,9 @@ func_mode_link ()
5262
4515
  ;;
5263
4516
  *)
5264
4517
  if test "$prev" = dlfiles; then
5265
- func_append dlfiles " $arg"
4518
+ dlfiles="$dlfiles $arg"
5266
4519
  else
5267
- func_append dlprefiles " $arg"
4520
+ dlprefiles="$dlprefiles $arg"
5268
4521
  fi
5269
4522
  prev=
5270
4523
  continue
@@ -5288,7 +4541,7 @@ func_mode_link ()
5288
4541
  *-*-darwin*)
5289
4542
  case "$deplibs " in
5290
4543
  *" $qarg.ltframework "*) ;;
5291
- *) func_append deplibs " $qarg.ltframework" # this is fixed later
4544
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
5292
4545
  ;;
5293
4546
  esac
5294
4547
  ;;
@@ -5307,7 +4560,7 @@ func_mode_link ()
5307
4560
  moreargs=
5308
4561
  for fil in `cat "$save_arg"`
5309
4562
  do
5310
- # func_append moreargs " $fil"
4563
+ # moreargs="$moreargs $fil"
5311
4564
  arg=$fil
5312
4565
  # A libtool-controlled object.
5313
4566
 
@@ -5336,7 +4589,7 @@ func_mode_link ()
5336
4589
 
5337
4590
  if test "$prev" = dlfiles; then
5338
4591
  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5339
- func_append dlfiles " $pic_object"
4592
+ dlfiles="$dlfiles $pic_object"
5340
4593
  prev=
5341
4594
  continue
5342
4595
  else
@@ -5348,7 +4601,7 @@ func_mode_link ()
5348
4601
  # CHECK ME: I think I busted this. -Ossama
5349
4602
  if test "$prev" = dlprefiles; then
5350
4603
  # Preload the old-style object.
5351
- func_append dlprefiles " $pic_object"
4604
+ dlprefiles="$dlprefiles $pic_object"
5352
4605
  prev=
5353
4606
  fi
5354
4607
 
@@ -5418,12 +4671,12 @@ func_mode_link ()
5418
4671
  if test "$prev" = rpath; then
5419
4672
  case "$rpath " in
5420
4673
  *" $arg "*) ;;
5421
- *) func_append rpath " $arg" ;;
4674
+ *) rpath="$rpath $arg" ;;
5422
4675
  esac
5423
4676
  else
5424
4677
  case "$xrpath " in
5425
4678
  *" $arg "*) ;;
5426
- *) func_append xrpath " $arg" ;;
4679
+ *) xrpath="$xrpath $arg" ;;
5427
4680
  esac
5428
4681
  fi
5429
4682
  prev=
@@ -5435,28 +4688,28 @@ func_mode_link ()
5435
4688
  continue
5436
4689
  ;;
5437
4690
  weak)
5438
- func_append weak_libs " $arg"
4691
+ weak_libs="$weak_libs $arg"
5439
4692
  prev=
5440
4693
  continue
5441
4694
  ;;
5442
4695
  xcclinker)
5443
- func_append linker_flags " $qarg"
5444
- func_append compiler_flags " $qarg"
4696
+ linker_flags="$linker_flags $qarg"
4697
+ compiler_flags="$compiler_flags $qarg"
5445
4698
  prev=
5446
4699
  func_append compile_command " $qarg"
5447
4700
  func_append finalize_command " $qarg"
5448
4701
  continue
5449
4702
  ;;
5450
4703
  xcompiler)
5451
- func_append compiler_flags " $qarg"
4704
+ compiler_flags="$compiler_flags $qarg"
5452
4705
  prev=
5453
4706
  func_append compile_command " $qarg"
5454
4707
  func_append finalize_command " $qarg"
5455
4708
  continue
5456
4709
  ;;
5457
4710
  xlinker)
5458
- func_append linker_flags " $qarg"
5459
- func_append compiler_flags " $wl$qarg"
4711
+ linker_flags="$linker_flags $qarg"
4712
+ compiler_flags="$compiler_flags $wl$qarg"
5460
4713
  prev=
5461
4714
  func_append compile_command " $wl$qarg"
5462
4715
  func_append finalize_command " $wl$qarg"
@@ -5547,16 +4800,15 @@ func_mode_link ()
5547
4800
  ;;
5548
4801
 
5549
4802
  -L*)
5550
- func_stripname "-L" '' "$arg"
5551
- if test -z "$func_stripname_result"; then
4803
+ func_stripname '-L' '' "$arg"
4804
+ dir=$func_stripname_result
4805
+ if test -z "$dir"; then
5552
4806
  if test "$#" -gt 0; then
5553
4807
  func_fatal_error "require no space between \`-L' and \`$1'"
5554
4808
  else
5555
4809
  func_fatal_error "need path for \`-L' option"
5556
4810
  fi
5557
4811
  fi
5558
- func_resolve_sysroot "$func_stripname_result"
5559
- dir=$func_resolve_sysroot_result
5560
4812
  # We need an absolute path.
5561
4813
  case $dir in
5562
4814
  [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -5568,16 +4820,10 @@ func_mode_link ()
5568
4820
  ;;
5569
4821
  esac
5570
4822
  case "$deplibs " in
5571
- *" -L$dir "* | *" $arg "*)
5572
- # Will only happen for absolute or sysroot arguments
5573
- ;;
4823
+ *" -L$dir "*) ;;
5574
4824
  *)
5575
- # Preserve sysroot, but never include relative directories
5576
- case $dir in
5577
- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
5578
- *) func_append deplibs " -L$dir" ;;
5579
- esac
5580
- func_append lib_search_path " $dir"
4825
+ deplibs="$deplibs -L$dir"
4826
+ lib_search_path="$lib_search_path $dir"
5581
4827
  ;;
5582
4828
  esac
5583
4829
  case $host in
@@ -5586,12 +4832,12 @@ func_mode_link ()
5586
4832
  case :$dllsearchpath: in
5587
4833
  *":$dir:"*) ;;
5588
4834
  ::) dllsearchpath=$dir;;
5589
- *) func_append dllsearchpath ":$dir";;
4835
+ *) dllsearchpath="$dllsearchpath:$dir";;
5590
4836
  esac
5591
4837
  case :$dllsearchpath: in
5592
4838
  *":$testbindir:"*) ;;
5593
4839
  ::) dllsearchpath=$testbindir;;
5594
- *) func_append dllsearchpath ":$testbindir";;
4840
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
5595
4841
  esac
5596
4842
  ;;
5597
4843
  esac
@@ -5615,7 +4861,7 @@ func_mode_link ()
5615
4861
  ;;
5616
4862
  *-*-rhapsody* | *-*-darwin1.[012])
5617
4863
  # Rhapsody C and math libraries are in the System framework
5618
- func_append deplibs " System.ltframework"
4864
+ deplibs="$deplibs System.ltframework"
5619
4865
  continue
5620
4866
  ;;
5621
4867
  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -5635,7 +4881,7 @@ func_mode_link ()
5635
4881
  ;;
5636
4882
  esac
5637
4883
  fi
5638
- func_append deplibs " $arg"
4884
+ deplibs="$deplibs $arg"
5639
4885
  continue
5640
4886
  ;;
5641
4887
 
@@ -5647,22 +4893,21 @@ func_mode_link ()
5647
4893
  # Tru64 UNIX uses -model [arg] to determine the layout of C++
5648
4894
  # classes, name mangling, and exception handling.
5649
4895
  # Darwin uses the -arch flag to determine output architecture.
5650
- -model|-arch|-isysroot|--sysroot)
5651
- func_append compiler_flags " $arg"
4896
+ -model|-arch|-isysroot)
4897
+ compiler_flags="$compiler_flags $arg"
5652
4898
  func_append compile_command " $arg"
5653
4899
  func_append finalize_command " $arg"
5654
4900
  prev=xcompiler
5655
4901
  continue
5656
4902
  ;;
5657
4903
 
5658
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
5659
- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
5660
- func_append compiler_flags " $arg"
4904
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
4905
+ compiler_flags="$compiler_flags $arg"
5661
4906
  func_append compile_command " $arg"
5662
4907
  func_append finalize_command " $arg"
5663
4908
  case "$new_inherited_linker_flags " in
5664
4909
  *" $arg "*) ;;
5665
- * ) func_append new_inherited_linker_flags " $arg" ;;
4910
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
5666
4911
  esac
5667
4912
  continue
5668
4913
  ;;
@@ -5729,17 +4974,13 @@ func_mode_link ()
5729
4974
  # We need an absolute path.
5730
4975
  case $dir in
5731
4976
  [\\/]* | [A-Za-z]:[\\/]*) ;;
5732
- =*)
5733
- func_stripname '=' '' "$dir"
5734
- dir=$lt_sysroot$func_stripname_result
5735
- ;;
5736
4977
  *)
5737
4978
  func_fatal_error "only absolute run-paths are allowed"
5738
4979
  ;;
5739
4980
  esac
5740
4981
  case "$xrpath " in
5741
4982
  *" $dir "*) ;;
5742
- *) func_append xrpath " $dir" ;;
4983
+ *) xrpath="$xrpath $dir" ;;
5743
4984
  esac
5744
4985
  continue
5745
4986
  ;;
@@ -5792,8 +5033,8 @@ func_mode_link ()
5792
5033
  for flag in $args; do
5793
5034
  IFS="$save_ifs"
5794
5035
  func_quote_for_eval "$flag"
5795
- func_append arg " $func_quote_for_eval_result"
5796
- func_append compiler_flags " $func_quote_for_eval_result"
5036
+ arg="$arg $func_quote_for_eval_result"
5037
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
5797
5038
  done
5798
5039
  IFS="$save_ifs"
5799
5040
  func_stripname ' ' '' "$arg"
@@ -5808,9 +5049,9 @@ func_mode_link ()
5808
5049
  for flag in $args; do
5809
5050
  IFS="$save_ifs"
5810
5051
  func_quote_for_eval "$flag"
5811
- func_append arg " $wl$func_quote_for_eval_result"
5812
- func_append compiler_flags " $wl$func_quote_for_eval_result"
5813
- func_append linker_flags " $func_quote_for_eval_result"
5052
+ arg="$arg $wl$func_quote_for_eval_result"
5053
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
5054
+ linker_flags="$linker_flags $func_quote_for_eval_result"
5814
5055
  done
5815
5056
  IFS="$save_ifs"
5816
5057
  func_stripname ' ' '' "$arg"
@@ -5849,16 +5090,13 @@ func_mode_link ()
5849
5090
  # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
5850
5091
  # @file GCC response files
5851
5092
  # -tp=* Portland pgcc target processor selection
5852
- # --sysroot=* for sysroot support
5853
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5854
5093
  -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
5855
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5856
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
5094
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
5857
5095
  func_quote_for_eval "$arg"
5858
5096
  arg="$func_quote_for_eval_result"
5859
5097
  func_append compile_command " $arg"
5860
5098
  func_append finalize_command " $arg"
5861
- func_append compiler_flags " $arg"
5099
+ compiler_flags="$compiler_flags $arg"
5862
5100
  continue
5863
5101
  ;;
5864
5102
 
@@ -5870,7 +5108,7 @@ func_mode_link ()
5870
5108
 
5871
5109
  *.$objext)
5872
5110
  # A standard object.
5873
- func_append objs " $arg"
5111
+ objs="$objs $arg"
5874
5112
  ;;
5875
5113
 
5876
5114
  *.lo)
@@ -5901,7 +5139,7 @@ func_mode_link ()
5901
5139
 
5902
5140
  if test "$prev" = dlfiles; then
5903
5141
  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
5904
- func_append dlfiles " $pic_object"
5142
+ dlfiles="$dlfiles $pic_object"
5905
5143
  prev=
5906
5144
  continue
5907
5145
  else
@@ -5913,7 +5151,7 @@ func_mode_link ()
5913
5151
  # CHECK ME: I think I busted this. -Ossama
5914
5152
  if test "$prev" = dlprefiles; then
5915
5153
  # Preload the old-style object.
5916
- func_append dlprefiles " $pic_object"
5154
+ dlprefiles="$dlprefiles $pic_object"
5917
5155
  prev=
5918
5156
  fi
5919
5157
 
@@ -5958,25 +5196,24 @@ func_mode_link ()
5958
5196
 
5959
5197
  *.$libext)
5960
5198
  # An archive.
5961
- func_append deplibs " $arg"
5962
- func_append old_deplibs " $arg"
5199
+ deplibs="$deplibs $arg"
5200
+ old_deplibs="$old_deplibs $arg"
5963
5201
  continue
5964
5202
  ;;
5965
5203
 
5966
5204
  *.la)
5967
5205
  # A libtool-controlled library.
5968
5206
 
5969
- func_resolve_sysroot "$arg"
5970
5207
  if test "$prev" = dlfiles; then
5971
5208
  # This library was specified with -dlopen.
5972
- func_append dlfiles " $func_resolve_sysroot_result"
5209
+ dlfiles="$dlfiles $arg"
5973
5210
  prev=
5974
5211
  elif test "$prev" = dlprefiles; then
5975
5212
  # The library was specified with -dlpreopen.
5976
- func_append dlprefiles " $func_resolve_sysroot_result"
5213
+ dlprefiles="$dlprefiles $arg"
5977
5214
  prev=
5978
5215
  else
5979
- func_append deplibs " $func_resolve_sysroot_result"
5216
+ deplibs="$deplibs $arg"
5980
5217
  fi
5981
5218
  continue
5982
5219
  ;;
@@ -6023,8 +5260,6 @@ func_mode_link ()
6023
5260
 
6024
5261
  func_dirname "$output" "/" ""
6025
5262
  output_objdir="$func_dirname_result$objdir"
6026
- func_to_tool_file "$output_objdir/"
6027
- tool_output_objdir=$func_to_tool_file_result
6028
5263
  # Create the object directory.
6029
5264
  func_mkdir_p "$output_objdir"
6030
5265
 
@@ -6045,12 +5280,12 @@ func_mode_link ()
6045
5280
  # Find all interdependent deplibs by searching for libraries
6046
5281
  # that are linked more than once (e.g. -la -lb -la)
6047
5282
  for deplib in $deplibs; do
6048
- if $opt_preserve_dup_deps ; then
5283
+ if $opt_duplicate_deps ; then
6049
5284
  case "$libs " in
6050
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5285
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
6051
5286
  esac
6052
5287
  fi
6053
- func_append libs " $deplib"
5288
+ libs="$libs $deplib"
6054
5289
  done
6055
5290
 
6056
5291
  if test "$linkmode" = lib; then
@@ -6063,9 +5298,9 @@ func_mode_link ()
6063
5298
  if $opt_duplicate_compiler_generated_deps; then
6064
5299
  for pre_post_dep in $predeps $postdeps; do
6065
5300
  case "$pre_post_deps " in
6066
- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
5301
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
6067
5302
  esac
6068
- func_append pre_post_deps " $pre_post_dep"
5303
+ pre_post_deps="$pre_post_deps $pre_post_dep"
6069
5304
  done
6070
5305
  fi
6071
5306
  pre_post_deps=
@@ -6124,10 +5359,7 @@ func_mode_link ()
6124
5359
  case $pass in
6125
5360
  dlopen) libs="$dlfiles" ;;
6126
5361
  dlpreopen) libs="$dlprefiles" ;;
6127
- link)
6128
- libs="$deplibs %DEPLIBS%"
6129
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
6130
- ;;
5362
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
6131
5363
  esac
6132
5364
  fi
6133
5365
  if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6135,9 +5367,8 @@ func_mode_link ()
6135
5367
  for lib in $dlprefiles; do
6136
5368
  # Ignore non-libtool-libs
6137
5369
  dependency_libs=
6138
- func_resolve_sysroot "$lib"
6139
5370
  case $lib in
6140
- *.la) func_source "$func_resolve_sysroot_result" ;;
5371
+ *.la) func_source "$lib" ;;
6141
5372
  esac
6142
5373
 
6143
5374
  # Collect preopened libtool deplibs, except any this library
@@ -6147,7 +5378,7 @@ func_mode_link ()
6147
5378
  deplib_base=$func_basename_result
6148
5379
  case " $weak_libs " in
6149
5380
  *" $deplib_base "*) ;;
6150
- *) func_append deplibs " $deplib" ;;
5381
+ *) deplibs="$deplibs $deplib" ;;
6151
5382
  esac
6152
5383
  done
6153
5384
  done
@@ -6163,17 +5394,16 @@ func_mode_link ()
6163
5394
  lib=
6164
5395
  found=no
6165
5396
  case $deplib in
6166
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
6167
- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
5397
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
6168
5398
  if test "$linkmode,$pass" = "prog,link"; then
6169
5399
  compile_deplibs="$deplib $compile_deplibs"
6170
5400
  finalize_deplibs="$deplib $finalize_deplibs"
6171
5401
  else
6172
- func_append compiler_flags " $deplib"
5402
+ compiler_flags="$compiler_flags $deplib"
6173
5403
  if test "$linkmode" = lib ; then
6174
5404
  case "$new_inherited_linker_flags " in
6175
5405
  *" $deplib "*) ;;
6176
- * ) func_append new_inherited_linker_flags " $deplib" ;;
5406
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
6177
5407
  esac
6178
5408
  fi
6179
5409
  fi
@@ -6258,7 +5488,7 @@ func_mode_link ()
6258
5488
  if test "$linkmode" = lib ; then
6259
5489
  case "$new_inherited_linker_flags " in
6260
5490
  *" $deplib "*) ;;
6261
- * ) func_append new_inherited_linker_flags " $deplib" ;;
5491
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
6262
5492
  esac
6263
5493
  fi
6264
5494
  fi
@@ -6271,8 +5501,7 @@ func_mode_link ()
6271
5501
  test "$pass" = conv && continue
6272
5502
  newdependency_libs="$deplib $newdependency_libs"
6273
5503
  func_stripname '-L' '' "$deplib"
6274
- func_resolve_sysroot "$func_stripname_result"
6275
- func_append newlib_search_path " $func_resolve_sysroot_result"
5504
+ newlib_search_path="$newlib_search_path $func_stripname_result"
6276
5505
  ;;
6277
5506
  prog)
6278
5507
  if test "$pass" = conv; then
@@ -6286,8 +5515,7 @@ func_mode_link ()
6286
5515
  finalize_deplibs="$deplib $finalize_deplibs"
6287
5516
  fi
6288
5517
  func_stripname '-L' '' "$deplib"
6289
- func_resolve_sysroot "$func_stripname_result"
6290
- func_append newlib_search_path " $func_resolve_sysroot_result"
5518
+ newlib_search_path="$newlib_search_path $func_stripname_result"
6291
5519
  ;;
6292
5520
  *)
6293
5521
  func_warning "\`-L' is ignored for archives/objects"
@@ -6298,21 +5526,17 @@ func_mode_link ()
6298
5526
  -R*)
6299
5527
  if test "$pass" = link; then
6300
5528
  func_stripname '-R' '' "$deplib"
6301
- func_resolve_sysroot "$func_stripname_result"
6302
- dir=$func_resolve_sysroot_result
5529
+ dir=$func_stripname_result
6303
5530
  # Make sure the xrpath contains only unique directories.
6304
5531
  case "$xrpath " in
6305
5532
  *" $dir "*) ;;
6306
- *) func_append xrpath " $dir" ;;
5533
+ *) xrpath="$xrpath $dir" ;;
6307
5534
  esac
6308
5535
  fi
6309
5536
  deplibs="$deplib $deplibs"
6310
5537
  continue
6311
5538
  ;;
6312
- *.la)
6313
- func_resolve_sysroot "$deplib"
6314
- lib=$func_resolve_sysroot_result
6315
- ;;
5539
+ *.la) lib="$deplib" ;;
6316
5540
  *.$libext)
6317
5541
  if test "$pass" = conv; then
6318
5542
  deplibs="$deplib $deplibs"
@@ -6375,11 +5599,11 @@ func_mode_link ()
6375
5599
  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
6376
5600
  # If there is no dlopen support or we're linking statically,
6377
5601
  # we need to preload.
6378
- func_append newdlprefiles " $deplib"
5602
+ newdlprefiles="$newdlprefiles $deplib"
6379
5603
  compile_deplibs="$deplib $compile_deplibs"
6380
5604
  finalize_deplibs="$deplib $finalize_deplibs"
6381
5605
  else
6382
- func_append newdlfiles " $deplib"
5606
+ newdlfiles="$newdlfiles $deplib"
6383
5607
  fi
6384
5608
  fi
6385
5609
  continue
@@ -6425,7 +5649,7 @@ func_mode_link ()
6425
5649
  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
6426
5650
  case " $new_inherited_linker_flags " in
6427
5651
  *" $tmp_inherited_linker_flag "*) ;;
6428
- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
5652
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
6429
5653
  esac
6430
5654
  done
6431
5655
  fi
@@ -6433,8 +5657,8 @@ func_mode_link ()
6433
5657
  if test "$linkmode,$pass" = "lib,link" ||
6434
5658
  test "$linkmode,$pass" = "prog,scan" ||
6435
5659
  { test "$linkmode" != prog && test "$linkmode" != lib; }; then
6436
- test -n "$dlopen" && func_append dlfiles " $dlopen"
6437
- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
5660
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
5661
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
6438
5662
  fi
6439
5663
 
6440
5664
  if test "$pass" = conv; then
@@ -6445,36 +5669,30 @@ func_mode_link ()
6445
5669
  func_fatal_error "cannot find name of link library for \`$lib'"
6446
5670
  fi
6447
5671
  # It is a libtool convenience library, so add in its objects.
6448
- func_append convenience " $ladir/$objdir/$old_library"
6449
- func_append old_convenience " $ladir/$objdir/$old_library"
6450
- tmp_libs=
6451
- for deplib in $dependency_libs; do
6452
- deplibs="$deplib $deplibs"
6453
- if $opt_preserve_dup_deps ; then
6454
- case "$tmp_libs " in
6455
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6456
- esac
6457
- fi
6458
- func_append tmp_libs " $deplib"
6459
- done
5672
+ convenience="$convenience $ladir/$objdir/$old_library"
5673
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
6460
5674
  elif test "$linkmode" != prog && test "$linkmode" != lib; then
6461
5675
  func_fatal_error "\`$lib' is not a convenience library"
6462
5676
  fi
5677
+ tmp_libs=
5678
+ for deplib in $dependency_libs; do
5679
+ deplibs="$deplib $deplibs"
5680
+ if $opt_duplicate_deps ; then
5681
+ case "$tmp_libs " in
5682
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5683
+ esac
5684
+ fi
5685
+ tmp_libs="$tmp_libs $deplib"
5686
+ done
6463
5687
  continue
6464
5688
  fi # $pass = conv
6465
5689
 
6466
5690
 
6467
5691
  # Get the name of the library we link against.
6468
5692
  linklib=
6469
- if test -n "$old_library" &&
6470
- { test "$prefer_static_libs" = yes ||
6471
- test "$prefer_static_libs,$installed" = "built,no"; }; then
6472
- linklib=$old_library
6473
- else
6474
- for l in $old_library $library_names; do
6475
- linklib="$l"
6476
- done
6477
- fi
5693
+ for l in $old_library $library_names; do
5694
+ linklib="$l"
5695
+ done
6478
5696
  if test -z "$linklib"; then
6479
5697
  func_fatal_error "cannot find name of link library for \`$lib'"
6480
5698
  fi
@@ -6491,9 +5709,9 @@ func_mode_link ()
6491
5709
  # statically, we need to preload. We also need to preload any
6492
5710
  # dependent libraries so libltdl's deplib preloader doesn't
6493
5711
  # bomb out in the load deplibs phase.
6494
- func_append dlprefiles " $lib $dependency_libs"
5712
+ dlprefiles="$dlprefiles $lib $dependency_libs"
6495
5713
  else
6496
- func_append newdlfiles " $lib"
5714
+ newdlfiles="$newdlfiles $lib"
6497
5715
  fi
6498
5716
  continue
6499
5717
  fi # $pass = dlopen
@@ -6515,14 +5733,14 @@ func_mode_link ()
6515
5733
 
6516
5734
  # Find the relevant object directory and library name.
6517
5735
  if test "X$installed" = Xyes; then
6518
- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
5736
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
6519
5737
  func_warning "library \`$lib' was moved."
6520
5738
  dir="$ladir"
6521
5739
  absdir="$abs_ladir"
6522
5740
  libdir="$abs_ladir"
6523
5741
  else
6524
- dir="$lt_sysroot$libdir"
6525
- absdir="$lt_sysroot$libdir"
5742
+ dir="$libdir"
5743
+ absdir="$libdir"
6526
5744
  fi
6527
5745
  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
6528
5746
  else
@@ -6530,12 +5748,12 @@ func_mode_link ()
6530
5748
  dir="$ladir"
6531
5749
  absdir="$abs_ladir"
6532
5750
  # Remove this search path later
6533
- func_append notinst_path " $abs_ladir"
5751
+ notinst_path="$notinst_path $abs_ladir"
6534
5752
  else
6535
5753
  dir="$ladir/$objdir"
6536
5754
  absdir="$abs_ladir/$objdir"
6537
5755
  # Remove this search path later
6538
- func_append notinst_path " $abs_ladir"
5756
+ notinst_path="$notinst_path $abs_ladir"
6539
5757
  fi
6540
5758
  fi # $installed = yes
6541
5759
  func_stripname 'lib' '.la' "$laname"
@@ -6546,46 +5764,20 @@ func_mode_link ()
6546
5764
  if test -z "$libdir" && test "$linkmode" = prog; then
6547
5765
  func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
6548
5766
  fi
6549
- case "$host" in
6550
- # special handling for platforms with PE-DLLs.
6551
- *cygwin* | *mingw* | *cegcc* )
6552
- # Linker will automatically link against shared library if both
6553
- # static and shared are present. Therefore, ensure we extract
6554
- # symbols from the import library if a shared library is present
6555
- # (otherwise, the dlopen module name will be incorrect). We do
6556
- # this by putting the import library name into $newdlprefiles.
6557
- # We recover the dlopen module name by 'saving' the la file
6558
- # name in a special purpose variable, and (later) extracting the
6559
- # dlname from the la file.
6560
- if test -n "$dlname"; then
6561
- func_tr_sh "$dir/$linklib"
6562
- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
6563
- func_append newdlprefiles " $dir/$linklib"
6564
- else
6565
- func_append newdlprefiles " $dir/$old_library"
6566
- # Keep a list of preopened convenience libraries to check
6567
- # that they are being used correctly in the link pass.
6568
- test -z "$libdir" && \
6569
- func_append dlpreconveniencelibs " $dir/$old_library"
6570
- fi
6571
- ;;
6572
- * )
6573
- # Prefer using a static library (so that no silly _DYNAMIC symbols
6574
- # are required to link).
6575
- if test -n "$old_library"; then
6576
- func_append newdlprefiles " $dir/$old_library"
6577
- # Keep a list of preopened convenience libraries to check
6578
- # that they are being used correctly in the link pass.
6579
- test -z "$libdir" && \
6580
- func_append dlpreconveniencelibs " $dir/$old_library"
6581
- # Otherwise, use the dlname, so that lt_dlopen finds it.
6582
- elif test -n "$dlname"; then
6583
- func_append newdlprefiles " $dir/$dlname"
6584
- else
6585
- func_append newdlprefiles " $dir/$linklib"
6586
- fi
6587
- ;;
6588
- esac
5767
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
5768
+ # are required to link).
5769
+ if test -n "$old_library"; then
5770
+ newdlprefiles="$newdlprefiles $dir/$old_library"
5771
+ # Keep a list of preopened convenience libraries to check
5772
+ # that they are being used correctly in the link pass.
5773
+ test -z "$libdir" && \
5774
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
5775
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
5776
+ elif test -n "$dlname"; then
5777
+ newdlprefiles="$newdlprefiles $dir/$dlname"
5778
+ else
5779
+ newdlprefiles="$newdlprefiles $dir/$linklib"
5780
+ fi
6589
5781
  fi # $pass = dlpreopen
6590
5782
 
6591
5783
  if test -z "$libdir"; then
@@ -6603,7 +5795,7 @@ func_mode_link ()
6603
5795
 
6604
5796
 
6605
5797
  if test "$linkmode" = prog && test "$pass" != link; then
6606
- func_append newlib_search_path " $ladir"
5798
+ newlib_search_path="$newlib_search_path $ladir"
6607
5799
  deplibs="$lib $deplibs"
6608
5800
 
6609
5801
  linkalldeplibs=no
@@ -6616,8 +5808,7 @@ func_mode_link ()
6616
5808
  for deplib in $dependency_libs; do
6617
5809
  case $deplib in
6618
5810
  -L*) func_stripname '-L' '' "$deplib"
6619
- func_resolve_sysroot "$func_stripname_result"
6620
- func_append newlib_search_path " $func_resolve_sysroot_result"
5811
+ newlib_search_path="$newlib_search_path $func_stripname_result"
6621
5812
  ;;
6622
5813
  esac
6623
5814
  # Need to link against all dependency_libs?
@@ -6628,12 +5819,12 @@ func_mode_link ()
6628
5819
  # or/and link against static libraries
6629
5820
  newdependency_libs="$deplib $newdependency_libs"
6630
5821
  fi
6631
- if $opt_preserve_dup_deps ; then
5822
+ if $opt_duplicate_deps ; then
6632
5823
  case "$tmp_libs " in
6633
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
5824
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
6634
5825
  esac
6635
5826
  fi
6636
- func_append tmp_libs " $deplib"
5827
+ tmp_libs="$tmp_libs $deplib"
6637
5828
  done # for deplib
6638
5829
  continue
6639
5830
  fi # $linkmode = prog...
@@ -6648,7 +5839,7 @@ func_mode_link ()
6648
5839
  # Make sure the rpath contains only unique directories.
6649
5840
  case "$temp_rpath:" in
6650
5841
  *"$absdir:"*) ;;
6651
- *) func_append temp_rpath "$absdir:" ;;
5842
+ *) temp_rpath="$temp_rpath$absdir:" ;;
6652
5843
  esac
6653
5844
  fi
6654
5845
 
@@ -6660,7 +5851,7 @@ func_mode_link ()
6660
5851
  *)
6661
5852
  case "$compile_rpath " in
6662
5853
  *" $absdir "*) ;;
6663
- *) func_append compile_rpath " $absdir" ;;
5854
+ *) compile_rpath="$compile_rpath $absdir"
6664
5855
  esac
6665
5856
  ;;
6666
5857
  esac
@@ -6669,7 +5860,7 @@ func_mode_link ()
6669
5860
  *)
6670
5861
  case "$finalize_rpath " in
6671
5862
  *" $libdir "*) ;;
6672
- *) func_append finalize_rpath " $libdir" ;;
5863
+ *) finalize_rpath="$finalize_rpath $libdir"
6673
5864
  esac
6674
5865
  ;;
6675
5866
  esac
@@ -6694,12 +5885,12 @@ func_mode_link ()
6694
5885
  case $host in
6695
5886
  *cygwin* | *mingw* | *cegcc*)
6696
5887
  # No point in relinking DLLs because paths are not encoded
6697
- func_append notinst_deplibs " $lib"
5888
+ notinst_deplibs="$notinst_deplibs $lib"
6698
5889
  need_relink=no
6699
5890
  ;;
6700
5891
  *)
6701
5892
  if test "$installed" = no; then
6702
- func_append notinst_deplibs " $lib"
5893
+ notinst_deplibs="$notinst_deplibs $lib"
6703
5894
  need_relink=yes
6704
5895
  fi
6705
5896
  ;;
@@ -6734,7 +5925,7 @@ func_mode_link ()
6734
5925
  *)
6735
5926
  case "$compile_rpath " in
6736
5927
  *" $absdir "*) ;;
6737
- *) func_append compile_rpath " $absdir" ;;
5928
+ *) compile_rpath="$compile_rpath $absdir"
6738
5929
  esac
6739
5930
  ;;
6740
5931
  esac
@@ -6743,7 +5934,7 @@ func_mode_link ()
6743
5934
  *)
6744
5935
  case "$finalize_rpath " in
6745
5936
  *" $libdir "*) ;;
6746
- *) func_append finalize_rpath " $libdir" ;;
5937
+ *) finalize_rpath="$finalize_rpath $libdir"
6747
5938
  esac
6748
5939
  ;;
6749
5940
  esac
@@ -6797,7 +5988,7 @@ func_mode_link ()
6797
5988
  linklib=$newlib
6798
5989
  fi # test -n "$old_archive_from_expsyms_cmds"
6799
5990
 
6800
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
5991
+ if test "$linkmode" = prog || test "$mode" != relink; then
6801
5992
  add_shlibpath=
6802
5993
  add_dir=
6803
5994
  add=
@@ -6848,12 +6039,12 @@ func_mode_link ()
6848
6039
  test "$hardcode_direct_absolute" = no; then
6849
6040
  add="$dir/$linklib"
6850
6041
  elif test "$hardcode_minus_L" = yes; then
6851
- add_dir="-L$absdir"
6042
+ add_dir="-L$dir"
6852
6043
  # Try looking first in the location we're being installed to.
6853
6044
  if test -n "$inst_prefix_dir"; then
6854
6045
  case $libdir in
6855
6046
  [\\/]*)
6856
- func_append add_dir " -L$inst_prefix_dir$libdir"
6047
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
6857
6048
  ;;
6858
6049
  esac
6859
6050
  fi
@@ -6875,7 +6066,7 @@ func_mode_link ()
6875
6066
  if test -n "$add_shlibpath"; then
6876
6067
  case :$compile_shlibpath: in
6877
6068
  *":$add_shlibpath:"*) ;;
6878
- *) func_append compile_shlibpath "$add_shlibpath:" ;;
6069
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
6879
6070
  esac
6880
6071
  fi
6881
6072
  if test "$linkmode" = prog; then
@@ -6889,13 +6080,13 @@ func_mode_link ()
6889
6080
  test "$hardcode_shlibpath_var" = yes; then
6890
6081
  case :$finalize_shlibpath: in
6891
6082
  *":$libdir:"*) ;;
6892
- *) func_append finalize_shlibpath "$libdir:" ;;
6083
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
6893
6084
  esac
6894
6085
  fi
6895
6086
  fi
6896
6087
  fi
6897
6088
 
6898
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
6089
+ if test "$linkmode" = prog || test "$mode" = relink; then
6899
6090
  add_shlibpath=
6900
6091
  add_dir=
6901
6092
  add=
@@ -6909,7 +6100,7 @@ func_mode_link ()
6909
6100
  elif test "$hardcode_shlibpath_var" = yes; then
6910
6101
  case :$finalize_shlibpath: in
6911
6102
  *":$libdir:"*) ;;
6912
- *) func_append finalize_shlibpath "$libdir:" ;;
6103
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
6913
6104
  esac
6914
6105
  add="-l$name"
6915
6106
  elif test "$hardcode_automatic" = yes; then
@@ -6926,7 +6117,7 @@ func_mode_link ()
6926
6117
  if test -n "$inst_prefix_dir"; then
6927
6118
  case $libdir in
6928
6119
  [\\/]*)
6929
- func_append add_dir " -L$inst_prefix_dir$libdir"
6120
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
6930
6121
  ;;
6931
6122
  esac
6932
6123
  fi
@@ -7003,33 +6194,27 @@ func_mode_link ()
7003
6194
  temp_xrpath=$func_stripname_result
7004
6195
  case " $xrpath " in
7005
6196
  *" $temp_xrpath "*) ;;
7006
- *) func_append xrpath " $temp_xrpath";;
6197
+ *) xrpath="$xrpath $temp_xrpath";;
7007
6198
  esac;;
7008
- *) func_append temp_deplibs " $libdir";;
6199
+ *) temp_deplibs="$temp_deplibs $libdir";;
7009
6200
  esac
7010
6201
  done
7011
6202
  dependency_libs="$temp_deplibs"
7012
6203
  fi
7013
6204
 
7014
- func_append newlib_search_path " $absdir"
6205
+ newlib_search_path="$newlib_search_path $absdir"
7015
6206
  # Link against this library
7016
6207
  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
7017
6208
  # ... and its dependency_libs
7018
6209
  tmp_libs=
7019
6210
  for deplib in $dependency_libs; do
7020
6211
  newdependency_libs="$deplib $newdependency_libs"
7021
- case $deplib in
7022
- -L*) func_stripname '-L' '' "$deplib"
7023
- func_resolve_sysroot "$func_stripname_result";;
7024
- *) func_resolve_sysroot "$deplib" ;;
7025
- esac
7026
- if $opt_preserve_dup_deps ; then
6212
+ if $opt_duplicate_deps ; then
7027
6213
  case "$tmp_libs " in
7028
- *" $func_resolve_sysroot_result "*)
7029
- func_append specialdeplibs " $func_resolve_sysroot_result" ;;
6214
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
7030
6215
  esac
7031
6216
  fi
7032
- func_append tmp_libs " $func_resolve_sysroot_result"
6217
+ tmp_libs="$tmp_libs $deplib"
7033
6218
  done
7034
6219
 
7035
6220
  if test "$link_all_deplibs" != no; then
@@ -7039,10 +6224,8 @@ func_mode_link ()
7039
6224
  case $deplib in
7040
6225
  -L*) path="$deplib" ;;
7041
6226
  *.la)
7042
- func_resolve_sysroot "$deplib"
7043
- deplib=$func_resolve_sysroot_result
7044
6227
  func_dirname "$deplib" "" "."
7045
- dir=$func_dirname_result
6228
+ dir="$func_dirname_result"
7046
6229
  # We need an absolute path.
7047
6230
  case $dir in
7048
6231
  [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -7069,8 +6252,8 @@ func_mode_link ()
7069
6252
  if test -z "$darwin_install_name"; then
7070
6253
  darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
7071
6254
  fi
7072
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
7073
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
6255
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
6256
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
7074
6257
  path=
7075
6258
  fi
7076
6259
  fi
@@ -7120,7 +6303,7 @@ func_mode_link ()
7120
6303
  for dir in $newlib_search_path; do
7121
6304
  case "$lib_search_path " in
7122
6305
  *" $dir "*) ;;
7123
- *) func_append lib_search_path " $dir" ;;
6306
+ *) lib_search_path="$lib_search_path $dir" ;;
7124
6307
  esac
7125
6308
  done
7126
6309
  newlib_search_path=
@@ -7178,10 +6361,10 @@ func_mode_link ()
7178
6361
  -L*)
7179
6362
  case " $tmp_libs " in
7180
6363
  *" $deplib "*) ;;
7181
- *) func_append tmp_libs " $deplib" ;;
6364
+ *) tmp_libs="$tmp_libs $deplib" ;;
7182
6365
  esac
7183
6366
  ;;
7184
- *) func_append tmp_libs " $deplib" ;;
6367
+ *) tmp_libs="$tmp_libs $deplib" ;;
7185
6368
  esac
7186
6369
  done
7187
6370
  eval $var=\"$tmp_libs\"
@@ -7197,7 +6380,7 @@ func_mode_link ()
7197
6380
  ;;
7198
6381
  esac
7199
6382
  if test -n "$i" ; then
7200
- func_append tmp_libs " $i"
6383
+ tmp_libs="$tmp_libs $i"
7201
6384
  fi
7202
6385
  done
7203
6386
  dependency_libs=$tmp_libs
@@ -7238,7 +6421,7 @@ func_mode_link ()
7238
6421
  # Now set the variables for building old libraries.
7239
6422
  build_libtool_libs=no
7240
6423
  oldlibs="$output"
7241
- func_append objs "$old_deplibs"
6424
+ objs="$objs$old_deplibs"
7242
6425
  ;;
7243
6426
 
7244
6427
  lib)
@@ -7274,7 +6457,7 @@ func_mode_link ()
7274
6457
  echo
7275
6458
  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
7276
6459
  $ECHO "*** objects $objs is not portable!"
7277
- func_append libobjs " $objs"
6460
+ libobjs="$libobjs $objs"
7278
6461
  fi
7279
6462
  fi
7280
6463
 
@@ -7333,7 +6516,6 @@ func_mode_link ()
7333
6516
  # which has an extra 1 added just for fun
7334
6517
  #
7335
6518
  case $version_type in
7336
- # correct linux to gnu/linux during the next big refactor
7337
6519
  darwin|linux|osf|windows|none)
7338
6520
  func_arith $number_major + $number_minor
7339
6521
  current=$func_arith_result
@@ -7352,9 +6534,6 @@ func_mode_link ()
7352
6534
  revision="$number_minor"
7353
6535
  lt_irix_increment=no
7354
6536
  ;;
7355
- *)
7356
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
7357
- ;;
7358
6537
  esac
7359
6538
  ;;
7360
6539
  no)
@@ -7453,7 +6632,7 @@ func_mode_link ()
7453
6632
  versuffix="$major.$revision"
7454
6633
  ;;
7455
6634
 
7456
- linux) # correct to gnu/linux during the next big refactor
6635
+ linux)
7457
6636
  func_arith $current - $age
7458
6637
  major=.$func_arith_result
7459
6638
  versuffix="$major.$age.$revision"
@@ -7476,7 +6655,7 @@ func_mode_link ()
7476
6655
  done
7477
6656
 
7478
6657
  # Make executables depend on our current version.
7479
- func_append verstring ":${current}.0"
6658
+ verstring="$verstring:${current}.0"
7480
6659
  ;;
7481
6660
 
7482
6661
  qnx)
@@ -7544,10 +6723,10 @@ func_mode_link ()
7544
6723
  fi
7545
6724
 
7546
6725
  func_generate_dlsyms "$libname" "$libname" "yes"
7547
- func_append libobjs " $symfileobj"
6726
+ libobjs="$libobjs $symfileobj"
7548
6727
  test "X$libobjs" = "X " && libobjs=
7549
6728
 
7550
- if test "$opt_mode" != relink; then
6729
+ if test "$mode" != relink; then
7551
6730
  # Remove our outputs, but don't remove object files since they
7552
6731
  # may have been created when compiling PIC objects.
7553
6732
  removelist=
@@ -7563,7 +6742,7 @@ func_mode_link ()
7563
6742
  continue
7564
6743
  fi
7565
6744
  fi
7566
- func_append removelist " $p"
6745
+ removelist="$removelist $p"
7567
6746
  ;;
7568
6747
  *) ;;
7569
6748
  esac
@@ -7574,7 +6753,7 @@ func_mode_link ()
7574
6753
 
7575
6754
  # Now set the variables for building old libraries.
7576
6755
  if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
7577
- func_append oldlibs " $output_objdir/$libname.$libext"
6756
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
7578
6757
 
7579
6758
  # Transform .lo files to .o files.
7580
6759
  oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
@@ -7591,11 +6770,10 @@ func_mode_link ()
7591
6770
  # If the user specified any rpath flags, then add them.
7592
6771
  temp_xrpath=
7593
6772
  for libdir in $xrpath; do
7594
- func_replace_sysroot "$libdir"
7595
- func_append temp_xrpath " -R$func_replace_sysroot_result"
6773
+ temp_xrpath="$temp_xrpath -R$libdir"
7596
6774
  case "$finalize_rpath " in
7597
6775
  *" $libdir "*) ;;
7598
- *) func_append finalize_rpath " $libdir" ;;
6776
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
7599
6777
  esac
7600
6778
  done
7601
6779
  if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -7609,7 +6787,7 @@ func_mode_link ()
7609
6787
  for lib in $old_dlfiles; do
7610
6788
  case " $dlprefiles $dlfiles " in
7611
6789
  *" $lib "*) ;;
7612
- *) func_append dlfiles " $lib" ;;
6790
+ *) dlfiles="$dlfiles $lib" ;;
7613
6791
  esac
7614
6792
  done
7615
6793
 
@@ -7619,7 +6797,7 @@ func_mode_link ()
7619
6797
  for lib in $old_dlprefiles; do
7620
6798
  case "$dlprefiles " in
7621
6799
  *" $lib "*) ;;
7622
- *) func_append dlprefiles " $lib" ;;
6800
+ *) dlprefiles="$dlprefiles $lib" ;;
7623
6801
  esac
7624
6802
  done
7625
6803
 
@@ -7631,7 +6809,7 @@ func_mode_link ()
7631
6809
  ;;
7632
6810
  *-*-rhapsody* | *-*-darwin1.[012])
7633
6811
  # Rhapsody C library is in the System framework
7634
- func_append deplibs " System.ltframework"
6812
+ deplibs="$deplibs System.ltframework"
7635
6813
  ;;
7636
6814
  *-*-netbsd*)
7637
6815
  # Don't link with libc until the a.out ld.so is fixed.
@@ -7648,7 +6826,7 @@ func_mode_link ()
7648
6826
  *)
7649
6827
  # Add libc to deplibs on all other systems if necessary.
7650
6828
  if test "$build_libtool_need_lc" = "yes"; then
7651
- func_append deplibs " -lc"
6829
+ deplibs="$deplibs -lc"
7652
6830
  fi
7653
6831
  ;;
7654
6832
  esac
@@ -7697,7 +6875,7 @@ EOF
7697
6875
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
7698
6876
  case " $predeps $postdeps " in
7699
6877
  *" $i "*)
7700
- func_append newdeplibs " $i"
6878
+ newdeplibs="$newdeplibs $i"
7701
6879
  i=""
7702
6880
  ;;
7703
6881
  esac
@@ -7708,7 +6886,7 @@ EOF
7708
6886
  set dummy $deplib_matches; shift
7709
6887
  deplib_match=$1
7710
6888
  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
7711
- func_append newdeplibs " $i"
6889
+ newdeplibs="$newdeplibs $i"
7712
6890
  else
7713
6891
  droppeddeps=yes
7714
6892
  echo
@@ -7722,7 +6900,7 @@ EOF
7722
6900
  fi
7723
6901
  ;;
7724
6902
  *)
7725
- func_append newdeplibs " $i"
6903
+ newdeplibs="$newdeplibs $i"
7726
6904
  ;;
7727
6905
  esac
7728
6906
  done
@@ -7740,7 +6918,7 @@ EOF
7740
6918
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
7741
6919
  case " $predeps $postdeps " in
7742
6920
  *" $i "*)
7743
- func_append newdeplibs " $i"
6921
+ newdeplibs="$newdeplibs $i"
7744
6922
  i=""
7745
6923
  ;;
7746
6924
  esac
@@ -7751,7 +6929,7 @@ EOF
7751
6929
  set dummy $deplib_matches; shift
7752
6930
  deplib_match=$1
7753
6931
  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
7754
- func_append newdeplibs " $i"
6932
+ newdeplibs="$newdeplibs $i"
7755
6933
  else
7756
6934
  droppeddeps=yes
7757
6935
  echo
@@ -7773,7 +6951,7 @@ EOF
7773
6951
  fi
7774
6952
  ;;
7775
6953
  *)
7776
- func_append newdeplibs " $i"
6954
+ newdeplibs="$newdeplibs $i"
7777
6955
  ;;
7778
6956
  esac
7779
6957
  done
@@ -7790,27 +6968,15 @@ EOF
7790
6968
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
7791
6969
  case " $predeps $postdeps " in
7792
6970
  *" $a_deplib "*)
7793
- func_append newdeplibs " $a_deplib"
6971
+ newdeplibs="$newdeplibs $a_deplib"
7794
6972
  a_deplib=""
7795
6973
  ;;
7796
6974
  esac
7797
6975
  fi
7798
6976
  if test -n "$a_deplib" ; then
7799
6977
  libname=`eval "\\$ECHO \"$libname_spec\""`
7800
- if test -n "$file_magic_glob"; then
7801
- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
7802
- else
7803
- libnameglob=$libname
7804
- fi
7805
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
7806
6978
  for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
7807
- if test "$want_nocaseglob" = yes; then
7808
- shopt -s nocaseglob
7809
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
7810
- $nocaseglob
7811
- else
7812
- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
7813
- fi
6979
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
7814
6980
  for potent_lib in $potential_libs; do
7815
6981
  # Follow soft links.
7816
6982
  if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7833,7 +6999,7 @@ EOF
7833
6999
  if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
7834
7000
  $SED -e 10q |
7835
7001
  $EGREP "$file_magic_regex" > /dev/null; then
7836
- func_append newdeplibs " $a_deplib"
7002
+ newdeplibs="$newdeplibs $a_deplib"
7837
7003
  a_deplib=""
7838
7004
  break 2
7839
7005
  fi
@@ -7858,7 +7024,7 @@ EOF
7858
7024
  ;;
7859
7025
  *)
7860
7026
  # Add a -L argument.
7861
- func_append newdeplibs " $a_deplib"
7027
+ newdeplibs="$newdeplibs $a_deplib"
7862
7028
  ;;
7863
7029
  esac
7864
7030
  done # Gone through all deplibs.
@@ -7874,7 +7040,7 @@ EOF
7874
7040
  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
7875
7041
  case " $predeps $postdeps " in
7876
7042
  *" $a_deplib "*)
7877
- func_append newdeplibs " $a_deplib"
7043
+ newdeplibs="$newdeplibs $a_deplib"
7878
7044
  a_deplib=""
7879
7045
  ;;
7880
7046
  esac
@@ -7887,7 +7053,7 @@ EOF
7887
7053
  potlib="$potent_lib" # see symlink-check above in file_magic test
7888
7054
  if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
7889
7055
  $EGREP "$match_pattern_regex" > /dev/null; then
7890
- func_append newdeplibs " $a_deplib"
7056
+ newdeplibs="$newdeplibs $a_deplib"
7891
7057
  a_deplib=""
7892
7058
  break 2
7893
7059
  fi
@@ -7912,7 +7078,7 @@ EOF
7912
7078
  ;;
7913
7079
  *)
7914
7080
  # Add a -L argument.
7915
- func_append newdeplibs " $a_deplib"
7081
+ newdeplibs="$newdeplibs $a_deplib"
7916
7082
  ;;
7917
7083
  esac
7918
7084
  done # Gone through all deplibs.
@@ -8016,7 +7182,7 @@ EOF
8016
7182
  *)
8017
7183
  case " $deplibs " in
8018
7184
  *" -L$path/$objdir "*)
8019
- func_append new_libs " -L$path/$objdir" ;;
7185
+ new_libs="$new_libs -L$path/$objdir" ;;
8020
7186
  esac
8021
7187
  ;;
8022
7188
  esac
@@ -8026,10 +7192,10 @@ EOF
8026
7192
  -L*)
8027
7193
  case " $new_libs " in
8028
7194
  *" $deplib "*) ;;
8029
- *) func_append new_libs " $deplib" ;;
7195
+ *) new_libs="$new_libs $deplib" ;;
8030
7196
  esac
8031
7197
  ;;
8032
- *) func_append new_libs " $deplib" ;;
7198
+ *) new_libs="$new_libs $deplib" ;;
8033
7199
  esac
8034
7200
  done
8035
7201
  deplibs="$new_libs"
@@ -8041,22 +7207,15 @@ EOF
8041
7207
 
8042
7208
  # Test again, we may have decided not to build it any more
8043
7209
  if test "$build_libtool_libs" = yes; then
8044
- # Remove ${wl} instances when linking with ld.
8045
- # FIXME: should test the right _cmds variable.
8046
- case $archive_cmds in
8047
- *\$LD\ *) wl= ;;
8048
- esac
8049
7210
  if test "$hardcode_into_libs" = yes; then
8050
7211
  # Hardcode the library paths
8051
7212
  hardcode_libdirs=
8052
7213
  dep_rpath=
8053
7214
  rpath="$finalize_rpath"
8054
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
7215
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
8055
7216
  for libdir in $rpath; do
8056
7217
  if test -n "$hardcode_libdir_flag_spec"; then
8057
7218
  if test -n "$hardcode_libdir_separator"; then
8058
- func_replace_sysroot "$libdir"
8059
- libdir=$func_replace_sysroot_result
8060
7219
  if test -z "$hardcode_libdirs"; then
8061
7220
  hardcode_libdirs="$libdir"
8062
7221
  else
@@ -8065,18 +7224,18 @@ EOF
8065
7224
  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
8066
7225
  ;;
8067
7226
  *)
8068
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
7227
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
8069
7228
  ;;
8070
7229
  esac
8071
7230
  fi
8072
7231
  else
8073
7232
  eval flag=\"$hardcode_libdir_flag_spec\"
8074
- func_append dep_rpath " $flag"
7233
+ dep_rpath="$dep_rpath $flag"
8075
7234
  fi
8076
7235
  elif test -n "$runpath_var"; then
8077
7236
  case "$perm_rpath " in
8078
7237
  *" $libdir "*) ;;
8079
- *) func_append perm_rpath " $libdir" ;;
7238
+ *) perm_rpath="$perm_rpath $libdir" ;;
8080
7239
  esac
8081
7240
  fi
8082
7241
  done
@@ -8084,13 +7243,17 @@ EOF
8084
7243
  if test -n "$hardcode_libdir_separator" &&
8085
7244
  test -n "$hardcode_libdirs"; then
8086
7245
  libdir="$hardcode_libdirs"
8087
- eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
7246
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
7247
+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
7248
+ else
7249
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
7250
+ fi
8088
7251
  fi
8089
7252
  if test -n "$runpath_var" && test -n "$perm_rpath"; then
8090
7253
  # We should set the runpath_var.
8091
7254
  rpath=
8092
7255
  for dir in $perm_rpath; do
8093
- func_append rpath "$dir:"
7256
+ rpath="$rpath$dir:"
8094
7257
  done
8095
7258
  eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
8096
7259
  fi
@@ -8098,7 +7261,7 @@ EOF
8098
7261
  fi
8099
7262
 
8100
7263
  shlibpath="$finalize_shlibpath"
8101
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
7264
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
8102
7265
  if test -n "$shlibpath"; then
8103
7266
  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
8104
7267
  fi
@@ -8124,7 +7287,7 @@ EOF
8124
7287
  linknames=
8125
7288
  for link
8126
7289
  do
8127
- func_append linknames " $link"
7290
+ linknames="$linknames $link"
8128
7291
  done
8129
7292
 
8130
7293
  # Use standard objects if they are pic
@@ -8135,7 +7298,7 @@ EOF
8135
7298
  if test -n "$export_symbols" && test -n "$include_expsyms"; then
8136
7299
  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
8137
7300
  export_symbols="$output_objdir/$libname.uexp"
8138
- func_append delfiles " $export_symbols"
7301
+ delfiles="$delfiles $export_symbols"
8139
7302
  fi
8140
7303
 
8141
7304
  orig_export_symbols=
@@ -8166,45 +7329,13 @@ EOF
8166
7329
  $opt_dry_run || $RM $export_symbols
8167
7330
  cmds=$export_symbols_cmds
8168
7331
  save_ifs="$IFS"; IFS='~'
8169
- for cmd1 in $cmds; do
7332
+ for cmd in $cmds; do
8170
7333
  IFS="$save_ifs"
8171
- # Take the normal branch if the nm_file_list_spec branch
8172
- # doesn't work or if tool conversion is not needed.
8173
- case $nm_file_list_spec~$to_tool_file_cmd in
8174
- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
8175
- try_normal_branch=yes
8176
- eval cmd=\"$cmd1\"
8177
- func_len " $cmd"
8178
- len=$func_len_result
8179
- ;;
8180
- *)
8181
- try_normal_branch=no
8182
- ;;
8183
- esac
8184
- if test "$try_normal_branch" = yes \
8185
- && { test "$len" -lt "$max_cmd_len" \
8186
- || test "$max_cmd_len" -le -1; }
8187
- then
8188
- func_show_eval "$cmd" 'exit $?'
8189
- skipped_export=false
8190
- elif test -n "$nm_file_list_spec"; then
8191
- func_basename "$output"
8192
- output_la=$func_basename_result
8193
- save_libobjs=$libobjs
8194
- save_output=$output
8195
- output=${output_objdir}/${output_la}.nm
8196
- func_to_tool_file "$output"
8197
- libobjs=$nm_file_list_spec$func_to_tool_file_result
8198
- func_append delfiles " $output"
8199
- func_verbose "creating $NM input file list: $output"
8200
- for obj in $save_libobjs; do
8201
- func_to_tool_file "$obj"
8202
- $ECHO "$func_to_tool_file_result"
8203
- done > "$output"
8204
- eval cmd=\"$cmd1\"
7334
+ eval cmd=\"$cmd\"
7335
+ func_len " $cmd"
7336
+ len=$func_len_result
7337
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
8205
7338
  func_show_eval "$cmd" 'exit $?'
8206
- output=$save_output
8207
- libobjs=$save_libobjs
8208
7339
  skipped_export=false
8209
7340
  else
8210
7341
  # The command line is too long to execute in one step.
@@ -8238,7 +7369,7 @@ EOF
8238
7369
  # global variables. join(1) would be nice here, but unfortunately
8239
7370
  # isn't a blessed tool.
8240
7371
  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
8241
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
7372
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
8242
7373
  export_symbols=$output_objdir/$libname.def
8243
7374
  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
8244
7375
  fi
@@ -8248,7 +7379,7 @@ EOF
8248
7379
  case " $convenience " in
8249
7380
  *" $test_deplib "*) ;;
8250
7381
  *)
8251
- func_append tmp_deplibs " $test_deplib"
7382
+ tmp_deplibs="$tmp_deplibs $test_deplib"
8252
7383
  ;;
8253
7384
  esac
8254
7385
  done
@@ -8268,21 +7399,21 @@ EOF
8268
7399
  test "X$libobjs" = "X " && libobjs=
8269
7400
  else
8270
7401
  gentop="$output_objdir/${outputname}x"
8271
- func_append generated " $gentop"
7402
+ generated="$generated $gentop"
8272
7403
 
8273
7404
  func_extract_archives $gentop $convenience
8274
- func_append libobjs " $func_extract_archives_result"
7405
+ libobjs="$libobjs $func_extract_archives_result"
8275
7406
  test "X$libobjs" = "X " && libobjs=
8276
7407
  fi
8277
7408
  fi
8278
7409
 
8279
7410
  if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
8280
7411
  eval flag=\"$thread_safe_flag_spec\"
8281
- func_append linker_flags " $flag"
7412
+ linker_flags="$linker_flags $flag"
8282
7413
  fi
8283
7414
 
8284
7415
  # Make a backup of the uninstalled library when relinking
8285
- if test "$opt_mode" = relink; then
7416
+ if test "$mode" = relink; then
8286
7417
  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
8287
7418
  fi
8288
7419
 
@@ -8344,13 +7475,10 @@ EOF
8344
7475
  echo 'INPUT (' > $output
8345
7476
  for obj in $save_libobjs
8346
7477
  do
8347
- func_to_tool_file "$obj"
8348
- $ECHO "$func_to_tool_file_result" >> $output
7478
+ $ECHO "$obj" >> $output
8349
7479
  done
8350
7480
  echo ')' >> $output
8351
- func_append delfiles " $output"
8352
- func_to_tool_file "$output"
8353
- output=$func_to_tool_file_result
7481
+ delfiles="$delfiles $output"
8354
7482
  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
8355
7483
  output=${output_objdir}/${output_la}.lnk
8356
7484
  func_verbose "creating linker input file list: $output"
@@ -8364,12 +7492,10 @@ EOF
8364
7492
  fi
8365
7493
  for obj
8366
7494
  do
8367
- func_to_tool_file "$obj"
8368
- $ECHO "$func_to_tool_file_result" >> $output
7495
+ $ECHO "$obj" >> $output
8369
7496
  done
8370
- func_append delfiles " $output"
8371
- func_to_tool_file "$output"
8372
- output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
7497
+ delfiles="$delfiles $output"
7498
+ output=$firstobj\"$file_list_spec$output\"
8373
7499
  else
8374
7500
  if test -n "$save_libobjs"; then
8375
7501
  func_verbose "creating reloadable object files..."
@@ -8420,7 +7546,7 @@ EOF
8420
7546
  if test -n "$last_robj"; then
8421
7547
  eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
8422
7548
  fi
8423
- func_append delfiles " $output"
7549
+ delfiles="$delfiles $output"
8424
7550
 
8425
7551
  else
8426
7552
  output=
@@ -8454,7 +7580,7 @@ EOF
8454
7580
  lt_exit=$?
8455
7581
 
8456
7582
  # Restore the uninstalled library and exit
8457
- if test "$opt_mode" = relink; then
7583
+ if test "$mode" = relink; then
8458
7584
  ( cd "$output_objdir" && \
8459
7585
  $RM "${realname}T" && \
8460
7586
  $MV "${realname}U" "$realname" )
@@ -8487,7 +7613,7 @@ EOF
8487
7613
  # global variables. join(1) would be nice here, but unfortunately
8488
7614
  # isn't a blessed tool.
8489
7615
  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
8490
- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
7616
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
8491
7617
  export_symbols=$output_objdir/$libname.def
8492
7618
  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
8493
7619
  fi
@@ -8528,10 +7654,10 @@ EOF
8528
7654
  # Add any objects from preloaded convenience libraries
8529
7655
  if test -n "$dlprefiles"; then
8530
7656
  gentop="$output_objdir/${outputname}x"
8531
- func_append generated " $gentop"
7657
+ generated="$generated $gentop"
8532
7658
 
8533
7659
  func_extract_archives $gentop $dlprefiles
8534
- func_append libobjs " $func_extract_archives_result"
7660
+ libobjs="$libobjs $func_extract_archives_result"
8535
7661
  test "X$libobjs" = "X " && libobjs=
8536
7662
  fi
8537
7663
 
@@ -8547,7 +7673,7 @@ EOF
8547
7673
  lt_exit=$?
8548
7674
 
8549
7675
  # Restore the uninstalled library and exit
8550
- if test "$opt_mode" = relink; then
7676
+ if test "$mode" = relink; then
8551
7677
  ( cd "$output_objdir" && \
8552
7678
  $RM "${realname}T" && \
8553
7679
  $MV "${realname}U" "$realname" )
@@ -8559,7 +7685,7 @@ EOF
8559
7685
  IFS="$save_ifs"
8560
7686
 
8561
7687
  # Restore the uninstalled library and exit
8562
- if test "$opt_mode" = relink; then
7688
+ if test "$mode" = relink; then
8563
7689
  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
8564
7690
 
8565
7691
  if test -n "$convenience"; then
@@ -8643,16 +7769,13 @@ EOF
8643
7769
  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
8644
7770
  else
8645
7771
  gentop="$output_objdir/${obj}x"
8646
- func_append generated " $gentop"
7772
+ generated="$generated $gentop"
8647
7773
 
8648
7774
  func_extract_archives $gentop $convenience
8649
7775
  reload_conv_objs="$reload_objs $func_extract_archives_result"
8650
7776
  fi
8651
7777
  fi
8652
7778
 
8653
- # If we're not building shared, we need to use non_pic_objs
8654
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
8655
-
8656
7779
  # Create the old-style object.
8657
7780
  reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
8658
7781
 
@@ -8726,8 +7849,8 @@ EOF
8726
7849
  if test "$tagname" = CXX ; then
8727
7850
  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
8728
7851
  10.[0123])
8729
- func_append compile_command " ${wl}-bind_at_load"
8730
- func_append finalize_command " ${wl}-bind_at_load"
7852
+ compile_command="$compile_command ${wl}-bind_at_load"
7853
+ finalize_command="$finalize_command ${wl}-bind_at_load"
8731
7854
  ;;
8732
7855
  esac
8733
7856
  fi
@@ -8747,7 +7870,7 @@ EOF
8747
7870
  *)
8748
7871
  case " $compile_deplibs " in
8749
7872
  *" -L$path/$objdir "*)
8750
- func_append new_libs " -L$path/$objdir" ;;
7873
+ new_libs="$new_libs -L$path/$objdir" ;;
8751
7874
  esac
8752
7875
  ;;
8753
7876
  esac
@@ -8757,17 +7880,17 @@ EOF
8757
7880
  -L*)
8758
7881
  case " $new_libs " in
8759
7882
  *" $deplib "*) ;;
8760
- *) func_append new_libs " $deplib" ;;
7883
+ *) new_libs="$new_libs $deplib" ;;
8761
7884
  esac
8762
7885
  ;;
8763
- *) func_append new_libs " $deplib" ;;
7886
+ *) new_libs="$new_libs $deplib" ;;
8764
7887
  esac
8765
7888
  done
8766
7889
  compile_deplibs="$new_libs"
8767
7890
 
8768
7891
 
8769
- func_append compile_command " $compile_deplibs"
8770
- func_append finalize_command " $finalize_deplibs"
7892
+ compile_command="$compile_command $compile_deplibs"
7893
+ finalize_command="$finalize_command $finalize_deplibs"
8771
7894
 
8772
7895
  if test -n "$rpath$xrpath"; then
8773
7896
  # If the user specified any rpath flags, then add them.
@@ -8775,7 +7898,7 @@ EOF
8775
7898
  # This is the magic to use -rpath.
8776
7899
  case "$finalize_rpath " in
8777
7900
  *" $libdir "*) ;;
8778
- *) func_append finalize_rpath " $libdir" ;;
7901
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
8779
7902
  esac
8780
7903
  done
8781
7904
  fi
@@ -8794,18 +7917,18 @@ EOF
8794
7917
  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
8795
7918
  ;;
8796
7919
  *)
8797
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
7920
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
8798
7921
  ;;
8799
7922
  esac
8800
7923
  fi
8801
7924
  else
8802
7925
  eval flag=\"$hardcode_libdir_flag_spec\"
8803
- func_append rpath " $flag"
7926
+ rpath="$rpath $flag"
8804
7927
  fi
8805
7928
  elif test -n "$runpath_var"; then
8806
7929
  case "$perm_rpath " in
8807
7930
  *" $libdir "*) ;;
8808
- *) func_append perm_rpath " $libdir" ;;
7931
+ *) perm_rpath="$perm_rpath $libdir" ;;
8809
7932
  esac
8810
7933
  fi
8811
7934
  case $host in
@@ -8814,12 +7937,12 @@ EOF
8814
7937
  case :$dllsearchpath: in
8815
7938
  *":$libdir:"*) ;;
8816
7939
  ::) dllsearchpath=$libdir;;
8817
- *) func_append dllsearchpath ":$libdir";;
7940
+ *) dllsearchpath="$dllsearchpath:$libdir";;
8818
7941
  esac
8819
7942
  case :$dllsearchpath: in
8820
7943
  *":$testbindir:"*) ;;
8821
7944
  ::) dllsearchpath=$testbindir;;
8822
- *) func_append dllsearchpath ":$testbindir";;
7945
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
8823
7946
  esac
8824
7947
  ;;
8825
7948
  esac
@@ -8845,18 +7968,18 @@ EOF
8845
7968
  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
8846
7969
  ;;
8847
7970
  *)
8848
- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
7971
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
8849
7972
  ;;
8850
7973
  esac
8851
7974
  fi
8852
7975
  else
8853
7976
  eval flag=\"$hardcode_libdir_flag_spec\"
8854
- func_append rpath " $flag"
7977
+ rpath="$rpath $flag"
8855
7978
  fi
8856
7979
  elif test -n "$runpath_var"; then
8857
7980
  case "$finalize_perm_rpath " in
8858
7981
  *" $libdir "*) ;;
8859
- *) func_append finalize_perm_rpath " $libdir" ;;
7982
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
8860
7983
  esac
8861
7984
  fi
8862
7985
  done
@@ -8907,12 +8030,6 @@ EOF
8907
8030
  exit_status=0
8908
8031
  func_show_eval "$link_command" 'exit_status=$?'
8909
8032
 
8910
- if test -n "$postlink_cmds"; then
8911
- func_to_tool_file "$output"
8912
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
8913
- func_execute_cmds "$postlink_cmds" 'exit $?'
8914
- fi
8915
-
8916
8033
  # Delete the generated files.
8917
8034
  if test -f "$output_objdir/${outputname}S.${objext}"; then
8918
8035
  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8935,7 +8052,7 @@ EOF
8935
8052
  # We should set the runpath_var.
8936
8053
  rpath=
8937
8054
  for dir in $perm_rpath; do
8938
- func_append rpath "$dir:"
8055
+ rpath="$rpath$dir:"
8939
8056
  done
8940
8057
  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
8941
8058
  fi
@@ -8943,7 +8060,7 @@ EOF
8943
8060
  # We should set the runpath_var.
8944
8061
  rpath=
8945
8062
  for dir in $finalize_perm_rpath; do
8946
- func_append rpath "$dir:"
8063
+ rpath="$rpath$dir:"
8947
8064
  done
8948
8065
  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
8949
8066
  fi
@@ -8958,13 +8075,6 @@ EOF
8958
8075
  $opt_dry_run || $RM $output
8959
8076
  # Link the executable and exit
8960
8077
  func_show_eval "$link_command" 'exit $?'
8961
-
8962
- if test -n "$postlink_cmds"; then
8963
- func_to_tool_file "$output"
8964
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
8965
- func_execute_cmds "$postlink_cmds" 'exit $?'
8966
- fi
8967
-
8968
8078
  exit $EXIT_SUCCESS
8969
8079
  fi
8970
8080
 
@@ -8998,12 +8108,6 @@ EOF
8998
8108
 
8999
8109
  func_show_eval "$link_command" 'exit $?'
9000
8110
 
9001
- if test -n "$postlink_cmds"; then
9002
- func_to_tool_file "$output_objdir/$outputname"
9003
- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
9004
- func_execute_cmds "$postlink_cmds" 'exit $?'
9005
- fi
9006
-
9007
8111
  # Now create the wrapper script.
9008
8112
  func_verbose "creating $output"
9009
8113
 
@@ -9101,7 +8205,7 @@ EOF
9101
8205
  else
9102
8206
  oldobjs="$old_deplibs $non_pic_objects"
9103
8207
  if test "$preload" = yes && test -f "$symfileobj"; then
9104
- func_append oldobjs " $symfileobj"
8208
+ oldobjs="$oldobjs $symfileobj"
9105
8209
  fi
9106
8210
  fi
9107
8211
  addlibs="$old_convenience"
@@ -9109,10 +8213,10 @@ EOF
9109
8213
 
9110
8214
  if test -n "$addlibs"; then
9111
8215
  gentop="$output_objdir/${outputname}x"
9112
- func_append generated " $gentop"
8216
+ generated="$generated $gentop"
9113
8217
 
9114
8218
  func_extract_archives $gentop $addlibs
9115
- func_append oldobjs " $func_extract_archives_result"
8219
+ oldobjs="$oldobjs $func_extract_archives_result"
9116
8220
  fi
9117
8221
 
9118
8222
  # Do each command in the archive commands.
@@ -9123,10 +8227,10 @@ EOF
9123
8227
  # Add any objects from preloaded convenience libraries
9124
8228
  if test -n "$dlprefiles"; then
9125
8229
  gentop="$output_objdir/${outputname}x"
9126
- func_append generated " $gentop"
8230
+ generated="$generated $gentop"
9127
8231
 
9128
8232
  func_extract_archives $gentop $dlprefiles
9129
- func_append oldobjs " $func_extract_archives_result"
8233
+ oldobjs="$oldobjs $func_extract_archives_result"
9130
8234
  fi
9131
8235
 
9132
8236
  # POSIX demands no paths to be encoded in archives. We have
@@ -9144,7 +8248,7 @@ EOF
9144
8248
  else
9145
8249
  echo "copying selected object files to avoid basename conflicts..."
9146
8250
  gentop="$output_objdir/${outputname}x"
9147
- func_append generated " $gentop"
8251
+ generated="$generated $gentop"
9148
8252
  func_mkdir_p "$gentop"
9149
8253
  save_oldobjs=$oldobjs
9150
8254
  oldobjs=
@@ -9168,30 +8272,18 @@ EOF
9168
8272
  esac
9169
8273
  done
9170
8274
  func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
9171
- func_append oldobjs " $gentop/$newobj"
8275
+ oldobjs="$oldobjs $gentop/$newobj"
9172
8276
  ;;
9173
- *) func_append oldobjs " $obj" ;;
8277
+ *) oldobjs="$oldobjs $obj" ;;
9174
8278
  esac
9175
8279
  done
9176
8280
  fi
9177
- func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
9178
- tool_oldlib=$func_to_tool_file_result
9179
8281
  eval cmds=\"$old_archive_cmds\"
9180
8282
 
9181
8283
  func_len " $cmds"
9182
8284
  len=$func_len_result
9183
8285
  if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
9184
8286
  cmds=$old_archive_cmds
9185
- elif test -n "$archiver_list_spec"; then
9186
- func_verbose "using command file archive linking..."
9187
- for obj in $oldobjs
9188
- do
9189
- func_to_tool_file "$obj"
9190
- $ECHO "$func_to_tool_file_result"
9191
- done > $output_objdir/$libname.libcmd
9192
- func_to_tool_file "$output_objdir/$libname.libcmd"
9193
- oldobjs=" $archiver_list_spec$func_to_tool_file_result"
9194
- cmds=$old_archive_cmds
9195
8287
  else
9196
8288
  # the command line is too long to link in one step, link in parts
9197
8289
  func_verbose "using piecewise archive linking..."
@@ -9285,23 +8377,12 @@ EOF
9285
8377
  *.la)
9286
8378
  func_basename "$deplib"
9287
8379
  name="$func_basename_result"
9288
- func_resolve_sysroot "$deplib"
9289
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
8380
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
9290
8381
  test -z "$libdir" && \
9291
8382
  func_fatal_error "\`$deplib' is not a valid libtool archive"
9292
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
9293
- ;;
9294
- -L*)
9295
- func_stripname -L '' "$deplib"
9296
- func_replace_sysroot "$func_stripname_result"
9297
- func_append newdependency_libs " -L$func_replace_sysroot_result"
9298
- ;;
9299
- -R*)
9300
- func_stripname -R '' "$deplib"
9301
- func_replace_sysroot "$func_stripname_result"
9302
- func_append newdependency_libs " -R$func_replace_sysroot_result"
8383
+ newdependency_libs="$newdependency_libs $libdir/$name"
9303
8384
  ;;
9304
- *) func_append newdependency_libs " $deplib" ;;
8385
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
9305
8386
  esac
9306
8387
  done
9307
8388
  dependency_libs="$newdependency_libs"
@@ -9315,9 +8396,9 @@ EOF
9315
8396
  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
9316
8397
  test -z "$libdir" && \
9317
8398
  func_fatal_error "\`$lib' is not a valid libtool archive"
9318
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
8399
+ newdlfiles="$newdlfiles $libdir/$name"
9319
8400
  ;;
9320
- *) func_append newdlfiles " $lib" ;;
8401
+ *) newdlfiles="$newdlfiles $lib" ;;
9321
8402
  esac
9322
8403
  done
9323
8404
  dlfiles="$newdlfiles"
@@ -9334,7 +8415,7 @@ EOF
9334
8415
  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
9335
8416
  test -z "$libdir" && \
9336
8417
  func_fatal_error "\`$lib' is not a valid libtool archive"
9337
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
8418
+ newdlprefiles="$newdlprefiles $libdir/$name"
9338
8419
  ;;
9339
8420
  esac
9340
8421
  done
@@ -9346,7 +8427,7 @@ EOF
9346
8427
  [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
9347
8428
  *) abs=`pwd`"/$lib" ;;
9348
8429
  esac
9349
- func_append newdlfiles " $abs"
8430
+ newdlfiles="$newdlfiles $abs"
9350
8431
  done
9351
8432
  dlfiles="$newdlfiles"
9352
8433
  newdlprefiles=
@@ -9355,7 +8436,7 @@ EOF
9355
8436
  [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
9356
8437
  *) abs=`pwd`"/$lib" ;;
9357
8438
  esac
9358
- func_append newdlprefiles " $abs"
8439
+ newdlprefiles="$newdlprefiles $abs"
9359
8440
  done
9360
8441
  dlprefiles="$newdlprefiles"
9361
8442
  fi
@@ -9440,7 +8521,7 @@ relink_command=\"$relink_command\""
9440
8521
  exit $EXIT_SUCCESS
9441
8522
  }
9442
8523
 
9443
- { test "$opt_mode" = link || test "$opt_mode" = relink; } &&
8524
+ { test "$mode" = link || test "$mode" = relink; } &&
9444
8525
  func_mode_link ${1+"$@"}
9445
8526
 
9446
8527
 
@@ -9460,9 +8541,9 @@ func_mode_uninstall ()
9460
8541
  for arg
9461
8542
  do
9462
8543
  case $arg in
9463
- -f) func_append RM " $arg"; rmforce=yes ;;
9464
- -*) func_append RM " $arg" ;;
9465
- *) func_append files " $arg" ;;
8544
+ -f) RM="$RM $arg"; rmforce=yes ;;
8545
+ -*) RM="$RM $arg" ;;
8546
+ *) files="$files $arg" ;;
9466
8547
  esac
9467
8548
  done
9468
8549
 
@@ -9471,23 +8552,24 @@ func_mode_uninstall ()
9471
8552
 
9472
8553
  rmdirs=
9473
8554
 
8555
+ origobjdir="$objdir"
9474
8556
  for file in $files; do
9475
8557
  func_dirname "$file" "" "."
9476
8558
  dir="$func_dirname_result"
9477
8559
  if test "X$dir" = X.; then
9478
- odir="$objdir"
8560
+ objdir="$origobjdir"
9479
8561
  else
9480
- odir="$dir/$objdir"
8562
+ objdir="$dir/$origobjdir"
9481
8563
  fi
9482
8564
  func_basename "$file"
9483
8565
  name="$func_basename_result"
9484
- test "$opt_mode" = uninstall && odir="$dir"
8566
+ test "$mode" = uninstall && objdir="$dir"
9485
8567
 
9486
- # Remember odir for removal later, being careful to avoid duplicates
9487
- if test "$opt_mode" = clean; then
8568
+ # Remember objdir for removal later, being careful to avoid duplicates
8569
+ if test "$mode" = clean; then
9488
8570
  case " $rmdirs " in
9489
- *" $odir "*) ;;
9490
- *) func_append rmdirs " $odir" ;;
8571
+ *" $objdir "*) ;;
8572
+ *) rmdirs="$rmdirs $objdir" ;;
9491
8573
  esac
9492
8574
  fi
9493
8575
 
@@ -9513,17 +8595,18 @@ func_mode_uninstall ()
9513
8595
 
9514
8596
  # Delete the libtool libraries and symlinks.
9515
8597
  for n in $library_names; do
9516
- func_append rmfiles " $odir/$n"
8598
+ rmfiles="$rmfiles $objdir/$n"
9517
8599
  done
9518
- test -n "$old_library" && func_append rmfiles " $odir/$old_library"
8600
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
9519
8601
 
9520
- case "$opt_mode" in
8602
+ case "$mode" in
9521
8603
  clean)
9522
- case " $library_names " in
8604
+ case " $library_names " in
8605
+ # " " in the beginning catches empty $dlname
9523
8606
  *" $dlname "*) ;;
9524
- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
8607
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
9525
8608
  esac
9526
- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
8609
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
9527
8610
  ;;
9528
8611
  uninstall)
9529
8612
  if test -n "$library_names"; then
@@ -9551,19 +8634,19 @@ func_mode_uninstall ()
9551
8634
  # Add PIC object to the list of files to remove.
9552
8635
  if test -n "$pic_object" &&
9553
8636
  test "$pic_object" != none; then
9554
- func_append rmfiles " $dir/$pic_object"
8637
+ rmfiles="$rmfiles $dir/$pic_object"
9555
8638
  fi
9556
8639
 
9557
8640
  # Add non-PIC object to the list of files to remove.
9558
8641
  if test -n "$non_pic_object" &&
9559
8642
  test "$non_pic_object" != none; then
9560
- func_append rmfiles " $dir/$non_pic_object"
8643
+ rmfiles="$rmfiles $dir/$non_pic_object"
9561
8644
  fi
9562
8645
  fi
9563
8646
  ;;
9564
8647
 
9565
8648
  *)
9566
- if test "$opt_mode" = clean ; then
8649
+ if test "$mode" = clean ; then
9567
8650
  noexename=$name
9568
8651
  case $file in
9569
8652
  *.exe)
@@ -9573,7 +8656,7 @@ func_mode_uninstall ()
9573
8656
  noexename=$func_stripname_result
9574
8657
  # $file with .exe has already been added to rmfiles,
9575
8658
  # add $file without .exe
9576
- func_append rmfiles " $file"
8659
+ rmfiles="$rmfiles $file"
9577
8660
  ;;
9578
8661
  esac
9579
8662
  # Do a test to see if this is a libtool program.
@@ -9582,7 +8665,7 @@ func_mode_uninstall ()
9582
8665
  func_ltwrapper_scriptname "$file"
9583
8666
  relink_command=
9584
8667
  func_source $func_ltwrapper_scriptname_result
9585
- func_append rmfiles " $func_ltwrapper_scriptname_result"
8668
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
9586
8669
  else
9587
8670
  relink_command=
9588
8671
  func_source $dir/$noexename
@@ -9590,12 +8673,12 @@ func_mode_uninstall ()
9590
8673
 
9591
8674
  # note $name still contains .exe if it was in $file originally
9592
8675
  # as does the version of $file that was added into $rmfiles
9593
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
8676
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
9594
8677
  if test "$fast_install" = yes && test -n "$relink_command"; then
9595
- func_append rmfiles " $odir/lt-$name"
8678
+ rmfiles="$rmfiles $objdir/lt-$name"
9596
8679
  fi
9597
8680
  if test "X$noexename" != "X$name" ; then
9598
- func_append rmfiles " $odir/lt-${noexename}.c"
8681
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
9599
8682
  fi
9600
8683
  fi
9601
8684
  fi
@@ -9603,6 +8686,7 @@ func_mode_uninstall ()
9603
8686
  esac
9604
8687
  func_show_eval "$RM $rmfiles" 'exit_status=1'
9605
8688
  done
8689
+ objdir="$origobjdir"
9606
8690
 
9607
8691
  # Try to remove the ${objdir}s in the directories where we deleted files
9608
8692
  for dir in $rmdirs; do
@@ -9614,16 +8698,16 @@ func_mode_uninstall ()
9614
8698
  exit $exit_status
9615
8699
  }
9616
8700
 
9617
- { test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
8701
+ { test "$mode" = uninstall || test "$mode" = clean; } &&
9618
8702
  func_mode_uninstall ${1+"$@"}
9619
8703
 
9620
- test -z "$opt_mode" && {
8704
+ test -z "$mode" && {
9621
8705
  help="$generic_help"
9622
8706
  func_fatal_help "you must specify a MODE"
9623
8707
  }
9624
8708
 
9625
8709
  test -z "$exec_cmd" && \
9626
- func_fatal_help "invalid operation mode \`$opt_mode'"
8710
+ func_fatal_help "invalid operation mode \`$mode'"
9627
8711
 
9628
8712
  if test -n "$exec_cmd"; then
9629
8713
  eval exec "$exec_cmd"