Ubuntu
libofx package

Merge lp:~benoitg/ubuntu/natty/libofx/libofx.new-upstream-fix-661809-629996 into lp:ubuntu/natty/libofx

  1. Natty (11.04)
  2. libofx.new-upstream-fix-661809-629996
  3. Merge into natty
Proposed by Benoit Grégoire
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp:~benoitg/ubuntu/natty/libofx/libofx.new-upstream-fix-661809-629996
Merge into: lp:ubuntu/natty/libofx
Diff against target: 222669 lines (+98627/-103117)
571 files modified
AUTHORS (+1/-1)
ChangeLog (+89/-51)
INSTALL (+189/-60)
Makefile.am (+4/-2)
Makefile.in (+279/-166)
NEWS (+26/-0)
README (+4/-4)
aclocal.m4 (+5565/-4108)
config.h.in (+21/-3)
config/config.guess (+139/-153)
config/config.sub (+113/-25)
config/depcomp (+136/-36)
config/install-sh (+369/-172)
config/ltmain.sh (+5054/-3579)
config/missing (+60/-44)
configure (+10738/-15591)
configure.in (+7/-6)
debian/applied-patches/libofx-utf8-rev1.patch (+0/-31)
debian/changelog (+14/-0)
debian/compat (+1/-1)
debian/control (+5/-5)
debian/copyright (+1/-1)
debian/rules (+7/-6)
debian/source/format (+1/-0)
debian/watch (+3/-0)
doc/Makefile.in (+185/-116)
doc/doxygen.cfg (+1002/-617)
doc/html/annotated.html (+78/-30)
doc/html/classLibofxContext.html (+143/-158)
doc/html/classNodeParser.html (+102/-58)
doc/html/classOFCApplication.html (+334/-447)
doc/html/classOFXApplication.html (+334/-456)
doc/html/classOfxAccountContainer.html (+293/-353)
doc/html/classOfxAccountInfoRequest.html (+156/-138)
doc/html/classOfxAggregate.html (+344/-454)
doc/html/classOfxBalanceContainer.html (+234/-233)
doc/html/classOfxBankTransactionContainer.html (+192/-189)
doc/html/classOfxDummyContainer.html (+188/-180)
doc/html/classOfxGenericContainer.html (+366/-477)
doc/html/classOfxInvestmentTransactionContainer.html (+192/-189)
doc/html/classOfxMainContainer.html (+180/-194)
doc/html/classOfxPaymentRequest.html (+201/-208)
doc/html/classOfxPushUpContainer.html (+188/-180)
doc/html/classOfxRequest.html (+302/-365)
doc/html/classOfxSecurityContainer.html (+292/-351)
doc/html/classOfxStatementContainer.html (+301/-371)
doc/html/classOfxStatementRequest.html (+328/-419)
doc/html/classOfxStatusContainer.html (+192/-185)
doc/html/classOfxTransactionContainer.html (+304/-374)
doc/html/classes.html (+89/-0)
doc/html/classtree.html (+499/-831)
doc/html/classtree_1_1fixed__depth__iterator.html (+152/-165)
doc/html/classtree_1_1iterator__base.html (+176/-197)
doc/html/classtree_1_1iterator__base__less.html (+95/-44)
doc/html/classtree_1_1post__order__iterator.html (+149/-158)
doc/html/classtree_1_1pre__order__iterator.html (+143/-146)
doc/html/classtree_1_1sibling__iterator.html (+156/-174)
doc/html/classtree__node__.html (+102/-81)
doc/html/config_8h-source.html (+0/-194)
doc/html/config_8h_source.html (+267/-0)
doc/html/context_8cpp-source.html (+0/-227)
doc/html/context_8cpp_source.html (+303/-0)
doc/html/context_8hh-source.html (+0/-88)
doc/html/context_8hh_source.html (+150/-0)
doc/html/doxygen.css (+782/-340)
doc/html/file__preproc_8cpp-source.html (+0/-178)
doc/html/file__preproc_8cpp.html (+225/-173)
doc/html/file__preproc_8cpp_source.html (+238/-0)
doc/html/file__preproc_8hh-source.html (+0/-40)
doc/html/file__preproc_8hh.html (+106/-51)
doc/html/file__preproc_8hh_source.html (+95/-0)
doc/html/files.html (+160/-147)
doc/html/functions.html (+181/-173)
doc/html/functions_0x62.html (+143/-93)
doc/html/functions_0x63.html (+129/-89)
doc/html/functions_0x64.html (+130/-111)
doc/html/functions_0x65.html (+132/-82)
doc/html/functions_0x66.html (+133/-100)
doc/html/functions_0x67.html (+118/-81)
doc/html/functions_0x68.html (+107/-70)
doc/html/functions_0x69.html (+137/-87)
doc/html/functions_0x6c.html (+111/-76)
doc/html/functions_0x6d.html (+154/-96)
doc/html/functions_0x6e.html (+116/-91)
doc/html/functions_0x6f.html (+145/-166)
doc/html/functions_0x70.html (+137/-101)
doc/html/functions_0x72.html (+111/-74)
doc/html/functions_0x73.html (+138/-124)
doc/html/functions_0x74.html (+127/-86)
doc/html/functions_0x75.html (+130/-94)
doc/html/functions_0x76.html (+109/-70)
doc/html/functions_0x77.html (+105/-63)
doc/html/functions_0x7e.html (+0/-90)
doc/html/functions_enum.html (+82/-38)
doc/html/functions_eval.html (+98/-46)
doc/html/functions_func.html (+382/-117)
doc/html/functions_func_0x62.html (+0/-73)
doc/html/functions_func_0x63.html (+0/-72)
doc/html/functions_func_0x64.html (+0/-75)
doc/html/functions_func_0x65.html (+0/-94)
doc/html/functions_func_0x66.html (+0/-70)
doc/html/functions_func_0x67.html (+0/-85)
doc/html/functions_func_0x69.html (+0/-80)
doc/html/functions_func_0x6c.html (+0/-66)
doc/html/functions_func_0x6d.html (+0/-72)
doc/html/functions_func_0x6e.html (+0/-77)
doc/html/functions_func_0x6f.html (+0/-152)
doc/html/functions_func_0x70.html (+0/-74)
doc/html/functions_func_0x72.html (+0/-74)
doc/html/functions_func_0x73.html (+0/-108)
doc/html/functions_func_0x74.html (+0/-70)
doc/html/functions_func_0x7e.html (+0/-86)
doc/html/functions_type.html (+82/-55)
doc/html/functions_vars.html (+632/-110)
doc/html/functions_vars_0x62.html (+0/-107)
doc/html/functions_vars_0x63.html (+0/-95)
doc/html/functions_vars_0x64.html (+0/-111)
doc/html/functions_vars_0x65.html (+0/-67)
doc/html/functions_vars_0x66.html (+0/-112)
doc/html/functions_vars_0x68.html (+0/-75)
doc/html/functions_vars_0x69.html (+0/-85)
doc/html/functions_vars_0x6c.html (+0/-81)
doc/html/functions_vars_0x6d.html (+0/-116)
doc/html/functions_vars_0x6e.html (+0/-87)
doc/html/functions_vars_0x6f.html (+0/-86)
doc/html/functions_vars_0x70.html (+0/-105)
doc/html/functions_vars_0x72.html (+0/-69)
doc/html/functions_vars_0x73.html (+0/-99)
doc/html/functions_vars_0x74.html (+0/-93)
doc/html/functions_vars_0x75.html (+0/-109)
doc/html/functions_vars_0x76.html (+0/-71)
doc/html/fx-0_88_82_2lib_2context_8cpp-source.html (+0/-218)
doc/html/fx-0_88_82_2lib_2context_8hh-source.html (+0/-80)
doc/html/fx-0_88_82_2lib_2file__preproc_8cpp-source.html (+0/-178)
doc/html/fx-0_88_82_2lib_2file__preproc_8cpp.html (+0/-187)
doc/html/fx-0_88_82_2lib_2file__preproc_8hh-source.html (+0/-40)
doc/html/fx-0_88_82_2lib_2file__preproc_8hh.html (+0/-67)
doc/html/fx-0_88_82_2lib_2getopt1_8c-source.html (+0/-208)
doc/html/fx-0_88_82_2lib_2getopt_8c-source.html (+0/-1075)
doc/html/fx-0_88_82_2lib_2gnugetopt_8h-source.html (+0/-200)
doc/html/fx-0_88_82_2lib_2messages_8cpp-source.html (+0/-148)
doc/html/fx-0_88_82_2lib_2messages_8cpp.html (+0/-341)
doc/html/fx-0_88_82_2lib_2messages_8hh-source.html (+0/-54)
doc/html/fx-0_88_82_2lib_2messages_8hh.html (+0/-204)
doc/html/fx-0_88_82_2lib_2ofc__sgml_8cpp-source.html (+0/-350)
doc/html/fx-0_88_82_2lib_2ofc__sgml_8cpp.html (+0/-123)
doc/html/fx-0_88_82_2lib_2ofc__sgml_8hh-source.html (+0/-42)
doc/html/fx-0_88_82_2lib_2ofc__sgml_8hh.html (+0/-76)
doc/html/fx-0_88_82_2lib_2ofx__aggregate_8hh-source.html (+0/-69)
doc/html/fx-0_88_82_2lib_2ofx__aggregate_8hh.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__container__account_8cpp-source.html (+0/-196)
doc/html/fx-0_88_82_2lib_2ofx__container__account_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__container__generic_8cpp-source.html (+0/-100)
doc/html/fx-0_88_82_2lib_2ofx__container__generic_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__container__main_8cpp-source.html (+0/-215)
doc/html/fx-0_88_82_2lib_2ofx__container__main_8cpp.html (+0/-32)
doc/html/fx-0_88_82_2lib_2ofx__container__security_8cpp-source.html (+0/-117)
doc/html/fx-0_88_82_2lib_2ofx__container__security_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__container__statement_8cpp-source.html (+0/-136)
doc/html/fx-0_88_82_2lib_2ofx__container__statement_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__container__transaction_8cpp-source.html (+0/-403)
doc/html/fx-0_88_82_2lib_2ofx__container__transaction_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__containers_8hh-source.html (+0/-209)
doc/html/fx-0_88_82_2lib_2ofx__containers_8hh.html (+0/-70)
doc/html/fx-0_88_82_2lib_2ofx__containers__misc_8cpp-source.html (+0/-184)
doc/html/fx-0_88_82_2lib_2ofx__containers__misc_8cpp.html (+0/-37)
doc/html/fx-0_88_82_2lib_2ofx__error__msg_8hh-source.html (+0/-153)
doc/html/fx-0_88_82_2lib_2ofx__error__msg_8hh.html (+0/-89)
doc/html/fx-0_88_82_2lib_2ofx__preproc_8cpp-source.html (+0/-529)
doc/html/fx-0_88_82_2lib_2ofx__preproc_8cpp.html (+0/-210)
doc/html/fx-0_88_82_2lib_2ofx__preproc_8hh-source.html (+0/-48)
doc/html/fx-0_88_82_2lib_2ofx__preproc_8hh.html (+0/-137)
doc/html/fx-0_88_82_2lib_2ofx__request_8cpp-source.html (+0/-115)
doc/html/fx-0_88_82_2lib_2ofx__request_8cpp.html (+0/-42)
doc/html/fx-0_88_82_2lib_2ofx__request_8hh-source.html (+0/-66)
doc/html/fx-0_88_82_2lib_2ofx__request_8hh.html (+0/-47)
doc/html/fx-0_88_82_2lib_2ofx__request__accountinfo_8cpp-source.html (+0/-98)
doc/html/fx-0_88_82_2lib_2ofx__request__accountinfo_8cpp.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__request__accountinfo_8hh-source.html (+0/-51)
doc/html/fx-0_88_82_2lib_2ofx__request__accountinfo_8hh.html (+0/-36)
doc/html/fx-0_88_82_2lib_2ofx__request__statement_8cpp-source.html (+0/-249)
doc/html/fx-0_88_82_2lib_2ofx__request__statement_8cpp.html (+0/-42)
doc/html/fx-0_88_82_2lib_2ofx__request__statement_8hh-source.html (+0/-74)
doc/html/fx-0_88_82_2lib_2ofx__request__statement_8hh.html (+0/-38)
doc/html/fx-0_88_82_2lib_2ofx__sgml_8cpp-source.html (+0/-357)
doc/html/fx-0_88_82_2lib_2ofx__sgml_8cpp.html (+0/-123)
doc/html/fx-0_88_82_2lib_2ofx__sgml_8hh-source.html (+0/-41)
doc/html/fx-0_88_82_2lib_2ofx__sgml_8hh.html (+0/-76)
doc/html/fx-0_88_82_2lib_2ofx__utilities_8cpp-source.html (+0/-199)
doc/html/fx-0_88_82_2lib_2ofx__utilities_8cpp.html (+0/-176)
doc/html/fx-0_88_82_2lib_2ofx__utilities_8hh-source.html (+0/-58)
doc/html/fx-0_88_82_2lib_2ofx__utilities_8hh.html (+0/-184)
doc/html/fx-0_88_82_2lib_2tree_8hh-source.html (+0/-2026)
doc/html/fx-0_89_80_2lib_2context_8cpp-source.html (+0/-227)
doc/html/fx-0_89_80_2lib_2context_8hh-source.html (+0/-88)
doc/html/fx-0_89_80_2lib_2file__preproc_8cpp-source.html (+0/-178)
doc/html/fx-0_89_80_2lib_2file__preproc_8cpp.html (+0/-187)
doc/html/fx-0_89_80_2lib_2file__preproc_8hh-source.html (+0/-40)
doc/html/fx-0_89_80_2lib_2file__preproc_8hh.html (+0/-67)
doc/html/fx-0_89_80_2lib_2getopt1_8c-source.html (+0/-208)
doc/html/fx-0_89_80_2lib_2getopt_8c-source.html (+0/-1075)
doc/html/fx-0_89_80_2lib_2gnugetopt_8h-source.html (+0/-200)
doc/html/fx-0_89_80_2lib_2messages_8cpp-source.html (+0/-148)
doc/html/fx-0_89_80_2lib_2messages_8cpp.html (+0/-341)
doc/html/fx-0_89_80_2lib_2messages_8hh-source.html (+0/-54)
doc/html/fx-0_89_80_2lib_2messages_8hh.html (+0/-204)
doc/html/fx-0_89_80_2lib_2ofc__sgml_8cpp-source.html (+0/-350)
doc/html/fx-0_89_80_2lib_2ofc__sgml_8cpp.html (+0/-123)
doc/html/fx-0_89_80_2lib_2ofc__sgml_8hh-source.html (+0/-42)
doc/html/fx-0_89_80_2lib_2ofc__sgml_8hh.html (+0/-76)
doc/html/fx-0_89_80_2lib_2ofx__aggregate_8hh-source.html (+0/-69)
doc/html/fx-0_89_80_2lib_2ofx__aggregate_8hh.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__container__account_8cpp-source.html (+0/-196)
doc/html/fx-0_89_80_2lib_2ofx__container__account_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__container__generic_8cpp-source.html (+0/-100)
doc/html/fx-0_89_80_2lib_2ofx__container__generic_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__container__main_8cpp-source.html (+0/-215)
doc/html/fx-0_89_80_2lib_2ofx__container__main_8cpp.html (+0/-32)
doc/html/fx-0_89_80_2lib_2ofx__container__security_8cpp-source.html (+0/-117)
doc/html/fx-0_89_80_2lib_2ofx__container__security_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__container__statement_8cpp-source.html (+0/-136)
doc/html/fx-0_89_80_2lib_2ofx__container__statement_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__container__transaction_8cpp-source.html (+0/-403)
doc/html/fx-0_89_80_2lib_2ofx__container__transaction_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__containers_8hh-source.html (+0/-209)
doc/html/fx-0_89_80_2lib_2ofx__containers_8hh.html (+0/-70)
doc/html/fx-0_89_80_2lib_2ofx__containers__misc_8cpp-source.html (+0/-184)
doc/html/fx-0_89_80_2lib_2ofx__containers__misc_8cpp.html (+0/-37)
doc/html/fx-0_89_80_2lib_2ofx__error__msg_8hh-source.html (+0/-153)
doc/html/fx-0_89_80_2lib_2ofx__error__msg_8hh.html (+0/-89)
doc/html/fx-0_89_80_2lib_2ofx__preproc_8cpp-source.html (+0/-553)
doc/html/fx-0_89_80_2lib_2ofx__preproc_8cpp.html (+0/-219)
doc/html/fx-0_89_80_2lib_2ofx__preproc_8hh-source.html (+0/-48)
doc/html/fx-0_89_80_2lib_2ofx__preproc_8hh.html (+0/-146)
doc/html/fx-0_89_80_2lib_2ofx__request_8cpp-source.html (+0/-137)
doc/html/fx-0_89_80_2lib_2ofx__request_8cpp.html (+0/-42)
doc/html/fx-0_89_80_2lib_2ofx__request_8hh-source.html (+0/-66)
doc/html/fx-0_89_80_2lib_2ofx__request_8hh.html (+0/-47)
doc/html/fx-0_89_80_2lib_2ofx__request__accountinfo_8cpp-source.html (+0/-98)
doc/html/fx-0_89_80_2lib_2ofx__request__accountinfo_8cpp.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__request__accountinfo_8hh-source.html (+0/-51)
doc/html/fx-0_89_80_2lib_2ofx__request__accountinfo_8hh.html (+0/-36)
doc/html/fx-0_89_80_2lib_2ofx__request__statement_8cpp-source.html (+0/-249)
doc/html/fx-0_89_80_2lib_2ofx__request__statement_8cpp.html (+0/-42)
doc/html/fx-0_89_80_2lib_2ofx__request__statement_8hh-source.html (+0/-74)
doc/html/fx-0_89_80_2lib_2ofx__request__statement_8hh.html (+0/-38)
doc/html/fx-0_89_80_2lib_2ofx__sgml_8cpp-source.html (+0/-357)
doc/html/fx-0_89_80_2lib_2ofx__sgml_8cpp.html (+0/-123)
doc/html/fx-0_89_80_2lib_2ofx__sgml_8hh-source.html (+0/-41)
doc/html/fx-0_89_80_2lib_2ofx__sgml_8hh.html (+0/-76)
doc/html/fx-0_89_80_2lib_2ofx__utilities_8cpp-source.html (+0/-237)
doc/html/fx-0_89_80_2lib_2ofx__utilities_8cpp.html (+0/-183)
doc/html/fx-0_89_80_2lib_2ofx__utilities_8hh-source.html (+0/-61)
doc/html/fx-0_89_80_2lib_2ofx__utilities_8hh.html (+0/-187)
doc/html/fx-0_89_80_2lib_2tree_8hh-source.html (+0/-2026)
doc/html/fx-0_89_80_2lib_2win32_8cpp-source.html (+0/-92)
doc/html/fx-0_89_80_2lib_2win32_8hh-source.html (+0/-53)
doc/html/fx-0_89_84_2lib_2context_8cpp_source.html (+303/-0)
doc/html/fx-0_89_84_2lib_2context_8hh_source.html (+150/-0)
doc/html/fx-0_89_84_2lib_2file__preproc_8cpp.html (+245/-0)
doc/html/fx-0_89_84_2lib_2file__preproc_8cpp_source.html (+238/-0)
doc/html/fx-0_89_84_2lib_2file__preproc_8hh.html (+124/-0)
doc/html/fx-0_89_84_2lib_2file__preproc_8hh_source.html (+95/-0)
doc/html/fx-0_89_84_2lib_2getopt1_8c_source.html (+263/-0)
doc/html/fx-0_89_84_2lib_2getopt_8c_source.html (+1130/-0)
doc/html/fx-0_89_84_2lib_2gnugetopt_8h_source.html (+255/-0)
doc/html/fx-0_89_84_2lib_2messages_8cpp.html (+369/-0)
doc/html/fx-0_89_84_2lib_2messages_8cpp_source.html (+215/-0)
doc/html/fx-0_89_84_2lib_2messages_8hh.html (+247/-0)
doc/html/fx-0_89_84_2lib_2messages_8hh_source.html (+110/-0)
doc/html/fx-0_89_84_2lib_2ofc__sgml_8cpp.html (+177/-0)
doc/html/fx-0_89_84_2lib_2ofc__sgml_8cpp_source.html (+412/-0)
doc/html/fx-0_89_84_2lib_2ofc__sgml_8hh.html (+133/-0)
doc/html/fx-0_89_84_2lib_2ofc__sgml_8hh_source.html (+97/-0)
doc/html/fx-0_89_84_2lib_2ofx__aggregate_8hh.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__aggregate_8hh_source.html (+124/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__account_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__account_8cpp_source.html (+269/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__generic_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__generic_8cpp_source.html (+157/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__main_8cpp.html (+86/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__main_8cpp_source.html (+271/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__security_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__security_8cpp_source.html (+181/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__statement_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__statement_8cpp_source.html (+199/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__transaction_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__container__transaction_8cpp_source.html (+534/-0)
doc/html/fx-0_89_84_2lib_2ofx__containers_8hh.html (+116/-0)
doc/html/fx-0_89_84_2lib_2ofx__containers_8hh_source.html (+276/-0)
doc/html/fx-0_89_84_2lib_2ofx__containers__misc_8cpp.html (+94/-0)
doc/html/fx-0_89_84_2lib_2ofx__containers__misc_8cpp_source.html (+251/-0)
doc/html/fx-0_89_84_2lib_2ofx__error__msg_8hh.html (+144/-0)
doc/html/fx-0_89_84_2lib_2ofx__error__msg_8hh_source.html (+212/-0)
doc/html/fx-0_89_84_2lib_2ofx__preproc_8cpp.html (+271/-0)
doc/html/fx-0_89_84_2lib_2ofx__preproc_8cpp_source.html (+751/-0)
doc/html/fx-0_89_84_2lib_2ofx__preproc_8hh.html (+204/-0)
doc/html/fx-0_89_84_2lib_2ofx__preproc_8hh_source.html (+103/-0)
doc/html/fx-0_89_84_2lib_2ofx__request_8cpp.html (+96/-0)
doc/html/fx-0_89_84_2lib_2ofx__request_8cpp_source.html (+194/-0)
doc/html/fx-0_89_84_2lib_2ofx__request_8hh.html (+101/-0)
doc/html/fx-0_89_84_2lib_2ofx__request_8hh_source.html (+121/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__accountinfo_8cpp.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__accountinfo_8cpp_source.html (+154/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__accountinfo_8hh.html (+92/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__accountinfo_8hh_source.html (+106/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__statement_8cpp.html (+96/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__statement_8cpp_source.html (+306/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__statement_8hh.html (+93/-0)
doc/html/fx-0_89_84_2lib_2ofx__request__statement_8hh_source.html (+129/-0)
doc/html/fx-0_89_84_2lib_2ofx__sgml_8cpp.html (+181/-0)
doc/html/fx-0_89_84_2lib_2ofx__sgml_8cpp_source.html (+428/-0)
doc/html/fx-0_89_84_2lib_2ofx__sgml_8hh.html (+133/-0)
doc/html/fx-0_89_84_2lib_2ofx__sgml_8hh_source.html (+96/-0)
doc/html/fx-0_89_84_2lib_2ofx__utilities_8cpp.html (+232/-0)
doc/html/fx-0_89_84_2lib_2ofx__utilities_8cpp_source.html (+329/-0)
doc/html/fx-0_89_84_2lib_2ofx__utilities_8hh.html (+239/-0)
doc/html/fx-0_89_84_2lib_2ofx__utilities_8hh_source.html (+116/-0)
doc/html/fx-0_89_84_2lib_2tree_8hh_source.html (+2206/-0)
doc/html/fx-0_89_84_2lib_2win32_8cpp_source.html (+152/-0)
doc/html/fx-0_89_84_2lib_2win32_8hh_source.html (+108/-0)
doc/html/getopt1_8c-source.html (+0/-208)
doc/html/getopt1_8c_source.html (+263/-0)
doc/html/getopt_8c-source.html (+0/-1075)
doc/html/getopt_8c_source.html (+1130/-0)
doc/html/globals.html (+107/-67)
doc/html/globals_0x63.html (+107/-71)
doc/html/globals_0x64.html (+126/-88)
doc/html/globals_0x65.html (+112/-73)
doc/html/globals_0x66.html (+110/-74)
doc/html/globals_0x69.html (+105/-64)
doc/html/globals_0x6c.html (+157/-176)
doc/html/globals_0x6d.html (+106/-96)
doc/html/globals_0x6f.html (+298/-439)
doc/html/globals_0x70.html (+109/-70)
doc/html/globals_0x71.html (+102/-63)
doc/html/globals_0x72.html (+102/-68)
doc/html/globals_0x73.html (+112/-77)
doc/html/globals_0x74.html (+102/-79)
doc/html/globals_0x75.html (+102/-61)
doc/html/globals_0x77.html (+102/-61)
doc/html/globals_defs.html (+0/-263)
doc/html/globals_enum.html (+93/-52)
doc/html/globals_eval.html (+296/-233)
doc/html/globals_func.html (+227/-256)
doc/html/globals_type.html (+98/-41)
doc/html/globals_vars.html (+157/-183)
doc/html/gnugetopt_8h-source.html (+0/-200)
doc/html/gnugetopt_8h_source.html (+255/-0)
doc/html/hierarchy.html (+147/-118)
doc/html/inc_2libofx_8h-source.html (+0/-451)
doc/html/inc_2libofx_8h.html (+1356/-1462)
doc/html/inc_2libofx_8h_source.html (+564/-0)
doc/html/index.html (+91/-10)
doc/html/jquery.js (+54/-0)
doc/html/libofx-0_88_82_2inc_2libofx_8h-source.html (+0/-434)
doc/html/libofx-0_88_82_2inc_2libofx_8h.html (+0/-1417)
doc/html/libofx-0_89_80_2inc_2libofx_8h-source.html (+0/-451)
doc/html/libofx-0_89_80_2inc_2libofx_8h.html (+0/-1444)
doc/html/libofx-0_89_84_2inc_2libofx_8h.html (+1340/-0)
doc/html/libofx-0_89_84_2inc_2libofx_8h_source.html (+564/-0)
doc/html/main.html (+0/-39)
doc/html/main__doc_8c-source.html (+0/-21)
doc/html/main__doc_8c_source.html (+76/-0)
doc/html/messages_8cpp-source.html (+0/-148)
doc/html/messages_8cpp.html (+380/-354)
doc/html/messages_8cpp_source.html (+215/-0)
doc/html/messages_8hh-source.html (+0/-54)
doc/html/messages_8hh.html (+208/-167)
doc/html/messages_8hh_source.html (+110/-0)
doc/html/namespaceOfxPartner.html (+0/-63)
doc/html/namespacekp.html (+86/-43)
doc/html/namespacemembers.html (+0/-57)
doc/html/namespacemembers_func.html (+0/-51)
doc/html/namespacemembers_vars.html (+0/-43)
doc/html/namespaces.html (+71/-25)
doc/html/navtree.css (+123/-0)
doc/html/navtree.js (+463/-0)
doc/html/nodeparser_8cpp-source.html (+0/-156)
doc/html/nodeparser_8cpp.html (+82/-28)
doc/html/nodeparser_8cpp_source.html (+211/-0)
doc/html/nodeparser_8h-source.html (+0/-60)
doc/html/nodeparser_8h.html (+87/-31)
doc/html/nodeparser_8h_source.html (+115/-0)
doc/html/ofc__sgml_8cpp-source.html (+0/-350)
doc/html/ofc__sgml_8cpp.html (+166/-112)
doc/html/ofc__sgml_8cpp_source.html (+412/-0)
doc/html/ofc__sgml_8hh-source.html (+0/-42)
doc/html/ofc__sgml_8hh.html (+113/-58)
doc/html/ofc__sgml_8hh_source.html (+97/-0)
doc/html/ofx2qif_8c-source.html (+0/-226)
doc/html/ofx2qif_8c.html (+103/-48)
doc/html/ofx2qif_8c_source.html (+281/-0)
doc/html/ofx__aggregate_8hh-source.html (+0/-69)
doc/html/ofx__aggregate_8hh.html (+88/-32)
doc/html/ofx__aggregate_8hh_source.html (+124/-0)
doc/html/ofx__container__account_8cpp-source.html (+0/-196)
doc/html/ofx__container__account_8cpp.html (+88/-32)
doc/html/ofx__container__account_8cpp_source.html (+269/-0)
doc/html/ofx__container__generic_8cpp-source.html (+0/-100)
doc/html/ofx__container__generic_8cpp.html (+88/-32)
doc/html/ofx__container__generic_8cpp_source.html (+157/-0)
doc/html/ofx__container__main_8cpp-source.html (+0/-215)
doc/html/ofx__container__main_8cpp.html (+82/-28)
doc/html/ofx__container__main_8cpp_source.html (+271/-0)
doc/html/ofx__container__security_8cpp-source.html (+0/-117)
doc/html/ofx__container__security_8cpp.html (+88/-32)
doc/html/ofx__container__security_8cpp_source.html (+181/-0)
doc/html/ofx__container__statement_8cpp-source.html (+0/-136)
doc/html/ofx__container__statement_8cpp.html (+88/-32)
doc/html/ofx__container__statement_8cpp_source.html (+199/-0)
doc/html/ofx__container__transaction_8cpp-source.html (+0/-403)
doc/html/ofx__container__transaction_8cpp.html (+88/-32)
doc/html/ofx__container__transaction_8cpp_source.html (+534/-0)
doc/html/ofx__containers_8hh-source.html (+0/-209)
doc/html/ofx__containers_8hh.html (+112/-66)
doc/html/ofx__containers_8hh_source.html (+276/-0)
doc/html/ofx__containers__misc_8cpp-source.html (+0/-184)
doc/html/ofx__containers__misc_8cpp.html (+90/-33)
doc/html/ofx__containers__misc_8cpp_source.html (+251/-0)
doc/html/ofx__error__msg_8hh-source.html (+0/-153)
doc/html/ofx__error__msg_8hh.html (+123/-68)
doc/html/ofx__error__msg_8hh_source.html (+212/-0)
doc/html/ofx__preproc_8cpp-source.html (+0/-553)
doc/html/ofx__preproc_8cpp.html (+275/-223)
doc/html/ofx__preproc_8cpp_source.html (+751/-0)
doc/html/ofx__preproc_8hh-source.html (+0/-48)
doc/html/ofx__preproc_8hh.html (+194/-142)
doc/html/ofx__preproc_8hh_source.html (+103/-0)
doc/html/ofx__request_8cpp-source.html (+0/-137)
doc/html/ofx__request_8cpp.html (+92/-38)
doc/html/ofx__request_8cpp_source.html (+194/-0)
doc/html/ofx__request_8hh-source.html (+0/-66)
doc/html/ofx__request_8hh.html (+95/-41)
doc/html/ofx__request_8hh_source.html (+121/-0)
doc/html/ofx__request__accountinfo_8cpp-source.html (+0/-98)
doc/html/ofx__request__accountinfo_8cpp.html (+88/-32)
doc/html/ofx__request__accountinfo_8cpp_source.html (+154/-0)
doc/html/ofx__request__accountinfo_8hh-source.html (+0/-51)
doc/html/ofx__request__accountinfo_8hh.html (+88/-32)
doc/html/ofx__request__accountinfo_8hh_source.html (+106/-0)
doc/html/ofx__request__statement_8cpp-source.html (+0/-249)
doc/html/ofx__request__statement_8cpp.html (+92/-38)
doc/html/ofx__request__statement_8cpp_source.html (+306/-0)
doc/html/ofx__request__statement_8hh-source.html (+0/-74)
doc/html/ofx__request__statement_8hh.html (+89/-34)
doc/html/ofx__request__statement_8hh_source.html (+129/-0)
doc/html/ofx__sgml_8cpp-source.html (+0/-357)
doc/html/ofx__sgml_8cpp.html (+166/-112)
doc/html/ofx__sgml_8cpp_source.html (+428/-0)
doc/html/ofx__sgml_8hh-source.html (+0/-41)
doc/html/ofx__sgml_8hh.html (+113/-58)
doc/html/ofx__sgml_8hh_source.html (+96/-0)
doc/html/ofx__utilities_8cpp-source.html (+0/-237)
doc/html/ofx__utilities_8cpp.html (+206/-157)
doc/html/ofx__utilities_8cpp_source.html (+329/-0)
doc/html/ofx__utilities_8hh-source.html (+0/-61)
doc/html/ofx__utilities_8hh.html (+195/-151)
doc/html/ofx__utilities_8hh_source.html (+116/-0)
doc/html/ofxconnect_2cmdline_8c-source.html (+0/-1065)
doc/html/ofxconnect_2cmdline_8c_source.html (+1063/-0)
doc/html/ofxconnect_2cmdline_8h-source.html (+0/-160)
doc/html/ofxconnect_2cmdline_8h_source.html (+232/-0)
doc/html/ofxconnect_8cpp-source.html (+0/-500)
doc/html/ofxconnect_8cpp.html (+96/-31)
doc/html/ofxconnect_8cpp_source.html (+557/-0)
doc/html/ofxdump_2cmdline_8c-source.html (+0/-560)
doc/html/ofxdump_2cmdline_8c_source.html (+726/-0)
doc/html/ofxdump_2cmdline_8h-source.html (+0/-119)
doc/html/ofxdump_2cmdline_8h_source.html (+191/-0)
doc/html/ofxdump_8cpp-source.html (+0/-445)
doc/html/ofxdump_8cpp.html (+115/-64)
doc/html/ofxdump_8cpp_source.html (+502/-0)
doc/html/ofxpartner_8cpp-source.html (+0/-243)
doc/html/ofxpartner_8cpp.html (+105/-57)
doc/html/ofxpartner_8cpp_source.html (+300/-0)
doc/html/ofxpartner_8h-source.html (+0/-51)
doc/html/ofxpartner_8h.html (+94/-45)
doc/html/ofxpartner_8h_source.html (+106/-0)
doc/html/resize.js (+81/-0)
doc/html/structErrorMsg.html (+143/-168)
doc/html/structLibofxFileFormatInfo.html (+141/-170)
doc/html/structOfxAccountData.html (+365/-509)
doc/html/structOfxCurrency.html (+141/-90)
doc/html/structOfxFiLogin.html (+104/-55)
doc/html/structOfxFiServiceInfo.html (+164/-126)
doc/html/structOfxPayee.html (+97/-50)
doc/html/structOfxPayment.html (+93/-44)
doc/html/structOfxSecurityData.html (+260/-228)
doc/html/structOfxStatementData.html (+290/-317)
doc/html/structOfxStatusData.html (+315/-517)
doc/html/structOfxTransactionData.html (+608/-684)
doc/html/structcmdline__parser__params.html (+104/-48)
doc/html/structgengetopt__args__info.html (+374/-424)
doc/html/structoption.html (+93/-56)
doc/html/tabs.css (+58/-101)
doc/html/tree.html (+0/-345)
doc/html/tree_8hh-source.html (+0/-2026)
doc/html/tree_8hh_source.html (+2206/-0)
doc/html/win32_8cpp-source.html (+0/-92)
doc/html/win32_8cpp_source.html (+152/-0)
doc/html/win32_8hh-source.html (+0/-53)
doc/html/win32_8hh_source.html (+108/-0)
doc/ofx_sample_files/CVS/Entries (+0/-3)
doc/ofx_sample_files/CVS/Repository (+0/-1)
doc/ofx_sample_files/CVS/Root (+0/-1)
dtd/Makefile.in (+124/-81)
dtd/ofc.dtd (+623/-623)
dtd/ofx160.dtd (+3497/-3497)
dtd/ofx201.dtd (+4789/-4789)
inc/Makefile.in (+144/-99)
inc/libofx.h (+697/-619)
inc/libofx.h.in (+695/-617)
lib/Makefile.am (+3/-3)
lib/Makefile.in (+167/-116)
lib/context.cpp (+76/-55)
lib/context.hh (+10/-3)
lib/file_preproc.cpp (+96/-91)
lib/file_preproc.hh (+4/-4)
lib/messages.cpp (+44/-32)
lib/messages.hh (+5/-4)
lib/ofc_sgml.cpp (+202/-195)
lib/ofc_sgml.hh (+2/-2)
lib/ofx_aggregate.hh (+27/-27)
lib/ofx_container_account.cpp (+116/-98)
lib/ofx_container_generic.cpp (+22/-20)
lib/ofx_container_main.cpp (+109/-108)
lib/ofx_container_security.cpp (+40/-31)
lib/ofx_container_statement.cpp (+52/-44)
lib/ofx_container_transaction.cpp (+299/-224)
lib/ofx_containers.hh (+59/-47)
lib/ofx_containers_misc.cpp (+60/-48)
lib/ofx_error_msg.hh (+15/-11)
lib/ofx_preproc.cpp (+528/-381)
lib/ofx_preproc.hh (+5/-5)
lib/ofx_request.cpp (+36/-35)
lib/ofx_request.hh (+3/-3)
lib/ofx_request_accountinfo.cpp (+4/-4)
lib/ofx_request_accountinfo.hh (+1/-1)
lib/ofx_request_statement.cpp (+39/-38)
lib/ofx_request_statement.hh (+5/-5)
lib/ofx_sgml.cpp (+209/-193)
lib/ofx_sgml.hh (+2/-2)
lib/ofx_utilities.cpp (+123/-88)
lib/ofx_utilities.hh (+5/-5)
lib/tree.hh (+1643/-1518)
lib/win32.cpp (+21/-16)
lib/win32.hh (+1/-1)
libofx.lsm (+6/-6)
libofx.lsm.in (+14/-0)
libofx.pc (+2/-2)
libofx.spec (+2/-2)
libofx.spec.in (+1/-1)
m4/Makefile.in (+94/-69)
m4/os.m4 (+1/-1)
ofx2qif/Makefile.am (+1/-1)
ofx2qif/Makefile.in (+167/-121)
ofx2qif/ofx2qif.c (+2/-2)
ofxconnect/Makefile.am (+4/-0)
ofxconnect/Makefile.in (+303/-152)
ofxconnect/cmdline.c (+494/-532)
ofxconnect/cmdline.h (+60/-32)
ofxconnect/ofxconnect.1 (+95/-0)
ofxconnect/ofxconnect.cpp (+3/-2)
ofxconnect/ofxpartner.cpp (+1/-1)
ofxdump/Makefile.am (+9/-2)
ofxdump/Makefile.in (+273/-142)
ofxdump/cmdline.c (+298/-168)
ofxdump/cmdline.h (+48/-20)
ofxdump/ofxdump.1 (+61/-0)
ofxdump/ofxdump.cpp (+3/-3)
To merge this branch: bzr merge lp:~benoitg/ubuntu/natty/libofx/libofx.new-upstream-fix-661809-629996
Reviewer Review Type Date Requested Status
Michael Terry Needs Fixing
Ubuntu branches Pending
Review via email: mp+58207@code.launchpad.net

Description of the change

Rationale for merging is that the previous patch for 629996 causes regressions, that it fixes a segfault 661809, and that the upstream has only bug fixes since 0.9.0, but none were picked-up by ubuntu.

libofx (1:0.9.4-0ubuntu1) natty; urgency=low

  * New upstream release. Since 0.9.4, all changes were bugfixes and
    changes requested by packagers
  * Add debian/watch
  * Add debian/source/format
  * Fix various lintian reported problems
  * Remove previous patch for 629996 which causes regressions.
    A better patch was integrated upstream.
  * Fixes (LP: #661809)
  * Add man pages for ofxdump and ofxconnect

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Hello! Thanks for the attention to libofx, looks like good stuff.

However, we're too close to natty's release to squeeze this in. And the changes are too invasive (changing source format, etc) to use as an SRU.

If the specific patches are very important, you can file an SRU for them that includes just the bug fix patches. See https://wiki.ubuntu.com/StableReleaseUpdates

Otherwise, these changes would be able to go into oneiric.

However! Even then, your packaging changes (source format, watch, etc) add quite a bit of a delta with Debian. It would be better to send those patches upstream to Debian than introduce them only in Ubuntu.

Lastly, I don't actually see any changes in this merge to the debian/ directory. Where are the packaging changes?

review: Needs Fixing
Revision history for this message
Benoit Grégoire (benoitg) wrote :
Download full text (4.5 KiB)

> Hello! Thanks for the attention to libofx, looks like good stuff.
>
> However, we're too close to natty's release to squeeze this in. And the
> changes are too invasive (changing source format, etc) to use as an SRU.

I tried following: https://wiki.ubuntu.com/PackagingGuide/Complete#Updating%20an%20Ubuntu%20Package, as scrupulously as possible, including the "Bonus points" section (Adding watch, etc.). I even created build recipes and automated builds on launchpad for the branch. I thought it would make it easier to get in, apparently that wasn't the case.

Would it make it more acceptable if I remove all the lintian warning removing packaging fixes?

> If the specific patches are very important, you can file an SRU for them that
> includes just the bug fix patches. See
> https://wiki.ubuntu.com/StableReleaseUpdates

Ok, according to this I should get on IRC and yell !regression-alert for bug #629996. That seems silly months later. Then presumably I'd be asked to propose an alternative patch for this bug, cherry-picked from upstream commits. Is that so? If so it's silly, but I'll do it, libofx having been broken by a ubuntu patch for most non-english and non japanese speaking users...

But I DO have 4 years of fixes for upstream reported bugs, ubuntu reported bugs, and debian reported bugs. Some of them are segfaults, which is a problem considering the number of packages that link with libofx. Am I expected to open a SRU for every one of them, then generate and regression an individual patch for each of them individually? Sorry, I have enough trouble as it is finding the time to actually fix the bugs.

The patch looks very invasive, because bzr contains the entire package uncompressed upstream tarball including generated files. But if we forget the (not so big) debian/ changes to follow https://wiki.ubuntu.com/PackagingGuide/Complete#Updating%20an%20Ubuntu%20Package and trying to get it back into debian (such as adding ma pages) this would be a simple patch:

-Remove all Ubuntu applied patches
-Update to upstream release 0.9.4
-Remove a dependency on an orphaned package (libxml++1.0) in debian/control
-Add man pages in debian/rules

Would that be considered?

If not, people will have to make do with ppas, and I'll push for integrating this branch in oneiric as is. I think I respected the entire procedure, including doing my best to try to get it into Debian.

> Otherwise, these changes would be able to go into oneiric.
>
> However! Even then, your packaging changes (source format, watch, etc) add
> quite a bit of a delta with Debian. It would be better to send those patches
> upstream to Debian than introduce them only in Ubuntu.

I did, and I am not the first: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=551057

Here is the situation (http://packages.debian.org/changelogs/pool/main/libo/libofx/libofx_0.9.0-3/changelog):

- Debian last updated to upstream in 2007, Ubuntu last updated to that package.

- Debian did various local patches in 2008, and haven't touched the package since.

- Upstream kept fixing bugs from 2009-2011, released 4 times, and ultimately superseded every Debian and Ubuntu patch, plus fix every de...

Read more...

Revision history for this message
Michael Terry (mterry) wrote :

Hi! Sorry; I didn't mean to be discouraging. I'm here to help this get in, not to stop it. It's just that we're a couple days away from release, so this couldn't go in as-is. If this had come in a few weeks ago, I could have rubber stamped it.

The fact that Debian has all but ignored this package for years makes it easier to just say, "We'll update in Ubuntu and deal with the delta if and when Debian decides to come along with us."

You're right about the debian/ directory, I didn't notice the little comment at the bottom of this LP page: "The diff has been truncated for viewing." Actually checking out the branch shows them.

So now we can just prepare an SRU and push it. I can handle that aspect for you, now that I see the debian/ changes. It's mostly paperwork, dropping the few changes that weren't strictly bug fixes (e.g. source format 3.0, watch file), then pushing to natty-proposed. Then when oneiric opens, we can push the full changeset there.

Revision history for this message
Benoit Grégoire (benoitg) wrote :

Ok, if I can do anything to help you, just say so.

Revision history for this message
Michael Terry (mterry) wrote :

Do you have an test case file for the latin1 problem?

Revision history for this message
Michael Terry (mterry) wrote :

nm, made one. OK, SRUs are filed!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2008-08-08 05:14:15 +0000
3+++ AUTHORS 2011-04-19 18:04:29 +0000
4@@ -1,4 +1,4 @@
5-Benoit Grégoire <bock@step.polymtl.ca>
6+Benoit Gr�goire <benoitg@coeus.ca>
7 Peter O'Gorman <peter@pogma.com>
8 Ace Jones <acejones@users.sf.net>
9 Martin Preuss<martin@aquamaniac.de>
10
11=== modified file 'ChangeLog'
12--- ChangeLog 2008-08-08 05:14:15 +0000
13+++ ChangeLog 2011-04-19 18:04:29 +0000
14@@ -1,3 +1,41 @@
15+2011-01-12 Christian Stimming <stimming@tuhh.de>
16+
17+ * configure.in: Release 0.9.2 with the previous bugfixes.
18+
19+ * lib/ofx_preproc.cpp: Win32: Add gnucash patch that looks up the
20+ dtd installation directory from the current executable's location.
21+
22+2010-10-26 Benoit Grégoire <benoitg@coeus.ca>
23+ * Apply patch by Geert Janssens to fix crash on invalid date format
24+
25+2010-04-27 Benoit Grégoire <benoitg@coeus.ca>
26+ * Patch by ajseward with some additional fixes to allow wraping the library in python.
27+
28+2010-02-04 Benoit Grégoire <benoitg@coeus.ca>
29+ * Applied a patch provided by Thomas Baumgart which fixes bug #5 (Transaction posting date off by one)
30+
31+2009-05-15 Benoit Grégoire <benoitg@coeus.ca>
32+ * Various C++ include fixes for building with recent compilers. Patch by Bill Nottingham <notting@redhat.com>
33+
34+2009-02-09 Christian Stimming <stimming@tuhh.de>
35+
36+ * configure.in: Release 0.9.1 with the bugfix for gnucash
37+
38+2008-12-06 Christian Stimming <stimming@tuhh.de>
39+
40+ * lib/ofx_preproc.cpp: Add more sanity checks on string length. I
41+ forgot the bug which required those to be fixed, but I fixed them
42+ anyway.
43+
44+ * lib/ofx_preproc.cpp: Fix gnucash crash on OFX files with
45+ non-ascii characters and very long lines. See
46+ http://bugzilla.gnome.org/show_bug.cgi?id=528306 and
47+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493597. Patch was
48+ copied from the latter. Patch by Jerome Vouillon.
49+
50+20/11/2007 Martin Preuss <martin@aquamaniac.de>
51+ * updated specfile
52+
53
54 19/11/2007 Martin Preuss <martin@aquamaniac.de>
55 * Release 0.9.0
56@@ -36,14 +74,14 @@
57 * ofx_utilities.{cpp,h}: added a function to generate a temp file name
58 (works on WIN32 and Linux)
59
60-24/1/2007: Benoit Grégoire <bock@step.polymtl.ca>
61+24/1/2007: Benoit Grégoire <benoitg@coeus.ca>
62 * ofx_preproc.cpp: Now parses the OFX headers to determine the input charset and
63 encoding, and uses libiconv (if available) to convert the encoding since OpenSP
64 can't do it. The default output is now UTF-8. This will "do the right thing"
65 for Gnucash 2 and any client that uses UTF-8 strings, but we should add an interface
66 to let the client chose his prefered output encoding.
67
68-9/1/2007: Benoit Grégoire <bock@step.polymtl.ca>
69+9/1/2007: Benoit Grégoire <benoitg@coeus.ca>
70 * Adapted patch by Christian Lupien <lupien @at@ physique.usherbrooke.ca> to add
71 processing of the different bank account types in OfxPaymentRequest. Took this
72 oportunity to correct an API duplication problem before it get's even more
73@@ -52,7 +90,7 @@
74 Both of these changes will require source code change in aqbanking.
75 * Bump the version and soname right now so aqbanking can detect it.
76
77-8/1/2007: Benoit Grégoire <bock@step.polymtl.ca>
78+8/1/2007: Benoit Grégoire <benoitg@coeus.ca>
79 * Release 0.8.3
80
81 27/9/2006 Martin Preuss <martin@aquamaniac.de>
82@@ -62,7 +100,7 @@
83 Fixes crash http://bugzilla.gnome.org/show_bug.cgi?id=353986
84 Patch supplied by Christian Stimming from GnuCash
85
86-25/8/2006: Benoit Grégoire <bock@step.polymtl.ca>
87+25/8/2006: Benoit Grégoire <benoitg@coeus.ca>
88 * Fix datatype mismatch in ofx_preproc.cpp
89 * Fix gengetopt related build problems on debian based distribution.
90 * Remove massage about dependency on Qt, qhich is no longuer true
91@@ -77,7 +115,7 @@
92 28/7/2006 Ace Jones <acejones@users.sf.net>
93 * Fixed a compilation bug on GCC 4.1
94
95-20/7/2006: Benoit Grégoire <bock@step.polymtl.ca>
96+20/7/2006: Benoit Grégoire <benoitg@coeus.ca>
97 * Revert last change to ofxdump, as it requires a system-dependent header (plus it didn't compile on my system)
98 * Make both curl and libxml++ optional for compilation.
99 * Add some debug output.
100@@ -144,7 +182,7 @@
101 27/8/2005 Ace Jones <acejones@users.sf.net>
102 * Added fees and commission fields to transaction structure (and fill them in)
103
104-31/7/2005: Benoit Grégoire <bock@step.polymtl.ca>
105+31/7/2005: Benoit Grégoire <benoitg@coeus.ca>
106 * Release 0.8.0
107 * configure.in: Update libtool version number. Make curl check fatal untill there is code to conditionally not compile ofxconnect when CURL is unavailable.
108 * Fix the build system so that discheck will finally run properly.
109@@ -173,19 +211,19 @@
110 * Added libofx_request_accountinfo API to create an OFX account into request
111 * Added ofxconnect sample app to demonstrate & test new API's (try "make check" in the ofxconnect folder). Read README.privateserver first.
112
113-24/11/2004: Benoit Grégoire <bock@step.polymtl.ca>
114+24/11/2004: Benoit Grégoire <benoitg@coeus.ca>
115 * Apply Christian Stimming's patch for rpm building. Also adds a make rpm target.
116
117-08/10/2004: Benoit Grégoire <bock@step.polymtl.ca>
118+08/10/2004: Benoit Grégoire <benoitg@coeus.ca>
119 * Release 0.7.0
120 * configure.in: Update libtool version number.
121
122-21/9/2004 Benoit Grégoire <bock@step.polymtl.ca>
123+21/9/2004 Benoit Grégoire <benoitg@coeus.ca>
124 * Really remove callback.hh and callback.cpp
125 * Fix compile with gcc 3.4. This also needs to be applied to the stable branch.
126 * Fix tree handling for securities, which caused the callbacks never to be called.
127
128-31/8/2004 Benoit Grégoire <bock@step.polymtl.ca>
129+31/8/2004 Benoit Grégoire <benoitg@coeus.ca>
130 * Remove obsolete files callback.hh and callback.cpp
131 * More makefile fixes in lib
132
133@@ -200,11 +238,11 @@
134 * a few Makefile fixes in lib
135 * adjusted ofxdump and ofx2qif to these changes
136
137-31/8/2004 Benoit Grégoire <bock@step.polymtl.ca>
138+31/8/2004 Benoit Grégoire <benoitg@coeus.ca>
139 * Revamp the callback architecture according to discussion with Martin Preuss. This is much cleaner and extensible, although a long way from perfect.
140 * Autoconf fixes from Martin Preuss
141
142-23/4/2004 Benoit Grégoire <bock@step.polymtl.ca>
143+23/4/2004 Benoit Grégoire <benoitg@coeus.ca>
144 * At long last, a flexible and extendable command line parser is used in ofxdump. This was essential for debuging, and even more essential for developing Direct Connect. Immediate benefits are that you can set the desired debug output without recompiling. Check ofxdump --help for options.
145 * configure.in: gengetopt will be used if available.
146 * lib/Makefile.am:
147@@ -220,23 +258,23 @@
148 * lib/file_preproc.cpp
149 * lib/file_preproc.hh
150
151-8/4/2004 Benoit Grégoire <bock@step.polymtl.ca>
152+8/4/2004 Benoit Grégoire <benoitg@coeus.ca>
153 * Multiple files: Working (but incomplete) OFC import. Still need cleanup. Pass context everywhere. Begin cleaning up tree handling.
154 * lib/tree.hh: Upgrade to latest version
155
156-31/3/2004 Benoit Grégoire <bock@step.polymtl.ca>
157+31/3/2004 Benoit Grégoire <benoitg@coeus.ca>
158 * lib/context.cpp,hh: New files. Create a global libofx object to allow the library to cleanly keep state. This will allow much cleanup, and is needed for the move to a DOM style interface. Other files ajusted to match.
159
160-7/3/2004 Benoit Grégoire <bock@step.polymtl.ca>
161+7/3/2004 Benoit Grégoire <benoitg@coeus.ca>
162 * lib/ofc_sgml.cpp/hh: New files. Splits code path for OFC and OFX to keep things understandeable. Some more OFC parsing. Now waiting to implement global libofx context object passed everywhere to make further progress.
163 * lib/messages.cpp: Move the definition of the required globals for displaying line numbers there, as it's the only place they are read.
164
165-3/3/2004 Benoit Grégoire <bock@step.polymtl.ca>
166+3/3/2004 Benoit Grégoire <benoitg@coeus.ca>
167 * Many...
168 * lib/file_preproc.cpp, lib/file_preproc.hh: Add file format autodetection architecture, can currently distinguish between OFX and OFC files. Note that because of this change, the main entry point of the library is now in file_preproc.cpp.
169 * dtd/ofc.dtd, lib/ofx_sgml.cpp, lib/ofx_preproc.cpp: Add embryo of OFC (Microsoft Open Financial Connectivity) to LibOFX. The SGML parses succesfully, but LibOFX does not yet know what to do with it. Big thanks to Jeremy Jongsma jeremy at jongsma.org for finally finding the required DTD. I haven't yet decided if its better to to add this support to ofx_proc_sgml.cpp (easier to maintain, less code duplication), or to create a ofc_proc_sgml.cpp (easier to understand, cleaner code).
170
171-3/2/2004 Benoit Grégoire <bock@step.polymtl.ca>
172+3/2/2004 Benoit Grégoire <benoitg@coeus.ca>
173 * inc/libofx.h lib/ofx_preproc.cpp lib/tree.hh ofx2qif/ofx2qif.c ofxdump/ofxdump.cpp: Make it compile. I may have misunderstood what Ryan wanted to do with the prototypes in libofx.h. If so, sorry. Note: I don't think that the void * passed as arguments are saved in the registry yet.
174
175 18/1/2004 Ryan P Bobko <ryan@ostrich-emulators.com>
176@@ -250,25 +288,25 @@
177 * ofx2qif/ofx2qif.c: all these files: improved callback registry by including a void pointer to arbitrary data (which can be set by the client in ofx_prep_cb). The pointer gets passed to the callback function as the second argument.
178
179
180-14/1/2004 Benoit Grégoire <bock@step.polymtl.ca>
181+14/1/2004 Benoit Grégoire <benoitg@coeus.ca>
182 * Merge initial Callback registration patch by Ryan P Bobko. Touches most files.
183
184-14/1/2004 Benoit Grégoire <bock@step.polymtl.ca>
185+14/1/2004 Benoit Grégoire <benoitg@coeus.ca>
186 RELEASE LibOfx 0.6.6
187 * configure.in: Change version number
188 * NEWS: Update for release
189 * Makefile.am: Add version number to docdir name
190 * libofx.spec.in: Remove known_bugs.txt
191
192-14/1/2004 Benoit Grégoire <bock@step.polymtl.ca>
193+14/1/2004 Benoit Grégoire <benoitg@coeus.ca>
194 * dtd/Makefile.am, dtd/opensp.dcl, * lib/ofx_preproc.[cpp,hh],: Add SGML declaration to be parsed before the DTD. Makes us immune to changes to default settings. Should get rid of "end tag for "MEMO" omitted, but OMITTAG NO was specified" type of messages and greatly help the parser.
195 * lib/ofx_sgml.cpp: Get rid of OpenSP 1.3.1 compatibility code, which makes the code much easier to understand and debug. Combined with the change obove, it should practically eliminate the parsing ambiguity that made libofx so verbose and ocasionally miss data. More defensive coding to warn of malformed files. This probably means that compatibility with OpenSP 1.3.1 cannot come back. However with the change above it may work after all. Somebody please test this...
196 * lib/messages.cpp: Finally implement displaying line numbers in the error output. This can be turned off by the clients by setting the ofx_show_position global. These should all get setter functions in the API re-write.
197
198-6/12/2003 Benoit Grégoire <bock@step.polymtl.ca>
199+6/12/2003 Benoit Grégoire <benoitg@coeus.ca>
200 * lib/ofx_container_transaction.cpp: Fix an infinite loop when searching for a parent statement for a transaction if it isn't the immediate parent. Thanks to stephen.a.prior A T ntlworld.ie for the catch.
201
202-12/9/2003 Benoit Grégoire <bock@step.polymtl.ca>
203+12/9/2003 Benoit Grégoire <benoitg@coeus.ca>
204 RELEASE LibOfx 0.6.5
205 * configure.in: Change version number
206 * NEWS: Update for release
207@@ -276,70 +314,70 @@
208 * doc/implementation_notes.txt: Moved contents in the doxygen docs.
209 * doc/Makefile.am: Fix the path for the html docs.
210
211-2/5/2003 Benoit Grégoire <bock@step.polymtl.ca>
212+2/5/2003 Benoit Grégoire <benoitg@coeus.ca>
213 * lib/ofx_utilities.cpp: Add #include <locale.h> to fix compile error on freebsd and possibly all gcc2 based distro.
214
215-15/4/2003 Benoit Grégoire <bock@step.polymtl.ca>
216+15/4/2003 Benoit Grégoire <benoitg@coeus.ca>
217 * lib/ofx_preproc.cpp: Fix for really broken files that do not have a newline after the ofx header. Fixes bug #721732
218
219-12/4/2003 Benoit Grégoire <bock@step.polymtl.ca>
220+12/4/2003 Benoit Grégoire <benoitg@coeus.ca>
221 RELEASE LibOfx 0.6.4
222 * configure.in: Change version number
223 * NEWS: Update for release
224 * lib/ofx_utilities.cpp: Fix bug in ofxamount_to_double() triggered by the client setting the locale. If the locale used ',' as decimal separator, it would get normalised to '.' and atof() would fail. Now normalises to (localeconv())->decimal_point. Closes gnucash bug 105481
225
226-18/3/2003 Benoit Grégoire <bock@step.polymtl.ca>
227+18/3/2003 Benoit Grégoire <benoitg@coeus.ca>
228 RELEASE LibOfx 0.6.3
229 * NEWS: Update for release
230 * Makefile.am: Remove references to known_bugx.txt
231
232-16/3/2003 Benoit Grégoire <bock@step.polymtl.ca>
233+16/3/2003 Benoit Grégoire <benoitg@coeus.ca>
234 * configure.in: Remove --with-opensp-multibyte configure option (it is now the default). There is now a --with-no-opensp-multibyte instead, to force libofx to assume that OpenSP was NOT compiled with SP_MULTI_BYTE defined.
235 * doc/doxygen.cfg: Remove, this file is now generated from doc/doxygen.cfg.in
236 * known_bugx.txt: Remove file, since we now have a bugtracker.
237 * README: Update
238 * INSTALL: Delete and replace by FAQ, update content.
239
240-11/3/2003 Benoit Grégoire <bock@step.polymtl.ca>
241+11/3/2003 Benoit Grégoire <benoitg@coeus.ca>
242 * ofxdump/ofxdump.cpp: Remove comand line arguments debug output.
243 * lib/ofx_container_main.cpp: Fix compiler warnings reported by Derek Atkins
244 * Misc build system cleanup
245
246-24/2/2003 Benoit Grégoire <bock@step.polymtl.ca>
247+24/2/2003 Benoit Grégoire <benoitg@coeus.ca>
248 * ofx2qif/ofx2qif.c: Apply patch by Scott Gifford <sgifford@suspectclass.com> to fix ofx2qif crash.
249 * Add a bunch of .cvsignore files
250
251-3/2/2003 Benoit Grégoire <bock@step.polymtl.ca>
252+3/2/2003 Benoit Grégoire <benoitg@coeus.ca>
253 * dtd/ofx160.dtd: Correct the dtd to fix the "content model is ambiguous" errors reported by opensp.
254
255 27/1/2003 Thomas Frayne <TomF@sjpc.org>
256 * ofxdump/ofxdump.cpp: Add command options: --version, -V, --help
257
258-3/2/2003 Benoit Grégoire <bock@step.polymtl.ca>
259+3/2/2003 Benoit Grégoire <benoitg@coeus.ca>
260 * lib/ofx_utilities.cpp: Fix ofxdate_to_time_t() that wouldn't compile on sun.
261
262-23/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
263+23/1/2003 Benoit Grégoire <benoitg@coeus.ca>
264 * lib/ofx_container_transaction.cpp: Explicitely ignore <MKTVAL> since it should always be equal to UNITS*UNITPRICE, and using it may lead to rounding errors.
265
266-22/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
267+22/1/2003 Benoit Grégoire <benoitg@coeus.ca>
268 * autogen.sh: Run libtoolize, and reorder the commands. The order is now: libtoolize,aclocal, autoheader, automake, autoconf and configure
269
270-11/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
271+11/1/2003 Benoit Grégoire <benoitg@coeus.ca>
272 * lib/ofx_utilities.cpp: Really fix problems for big endian machines.
273 * INSTALL: Document the --with-opensp-multibyte workaround for when headers in package lie about the compile option of OpenSP (usually because they were not compiled at the same time). This is the case with the OpenJade package distributed in Mandrake cooker, and perhaps others.
274 * configure.in: add --with-opensp-multibyte option
275
276-10/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
277+10/1/2003 Benoit Grégoire <benoitg@coeus.ca>
278 * lib/ofx_utilities.cpp: Try to fix problems for big endian machines.
279
280-9/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
281+9/1/2003 Benoit Grégoire <benoitg@coeus.ca>
282 * configure.in: Add /usr/local/include to OpenSP's include search path.
283 * INSTALL: Add FAQ for "bug" http://sourceforge.net/tracker/index.php?func=detail&aid=654591&group_id=61170&atid=496353
284
285-9/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
286+9/1/2003 Benoit Grégoire <benoitg@coeus.ca>
287 * lib/ofx_utilities.cpp: Remove the ugly get_sp_char_size() hack and use SP_MULTI_BYTE in config.h instead. This probably fixes the "libofx not working on big endian machines" bug.
288
289-9/1/2003 Benoit Grégoire <bock@step.polymtl.ca>
290+9/1/2003 Benoit Grégoire <benoitg@coeus.ca>
291 * configure.in: Now detect if OpenSP was compiled with SP_MULTI_BYTE, and put the result in config.
292 * INSTALL: Update for GNU build system.
293
294@@ -350,10 +388,10 @@
295 24/11/2002 Chris Lyttle <chris@wilddev.net>
296 * libofx.spec.in: updated for new docs
297
298-24/11/2002 Benoit Grégoire <bock@step.polymtl.ca>
299+24/11/2002 Benoit Grégoire <benoitg@coeus.ca>
300 * configure.in, doc/Makefile.am: Improve doxygen doc generation, and enable make install without the doc.
301
302-24/11/2002 Benoit Grégoire <bock@step.polymtl.ca>
303+24/11/2002 Benoit Grégoire <benoitg@coeus.ca>
304 * ofx_sgml.cpp: Hopefully fix incompatibilities with BOTH OpenSP 1.3.x and OpenSP >= 1.4
305 * Makefile.am, doc/Makefile.am: Doxygen API and internal doc now integrated in the build system. It will be distributed and install with the tarballs, and can be build in libofx-cvs using make doc.
306 * autogen.sh: Re-enable maintainer-mode.
307@@ -366,43 +404,43 @@
308 * configure.in: added spec.in line
309 * autogen.sh: changed configure line to see arguments
310
311-18/11/2002 Benoit Grégoire <bock@step.polymtl.ca>
312+18/11/2002 Benoit Grégoire <benoitg@coeus.ca>
313 * ofx_sgml.cpp: Fix critical bug. Parsing of a file would fail and hang for users of OpenSP 1.5pre5 (and possibly others). Simplify workaround of OpenSP 1.3 bugs, more code is now shared.
314 * configure.in: Update for release 0.6.1
315
316-18/11/2002 Benoit Grégoire <bock@step.polymtl.ca>
317+18/11/2002 Benoit Grégoire <benoitg@coeus.ca>
318 * Update build files for release of libofx 0.6.0
319
320-30/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
321+30/10/2002 Benoit Grégoire <benoitg@coeus.ca>
322 * inc/libofx.h lib/ofx_container_transaction.cpp ofxdump/ofxdump.cpp: Created a new invtransactiontype enum to replace the invtranstype string
323
324-30/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
325+30/10/2002 Benoit Grégoire <benoitg@coeus.ca>
326 * lib/ofx_sgml.cpp: Added yet more spagetti code and global variables to improve the work around for OpenSP 1.3 bugs. I beg of you, please convince your distro to make openjade and the OpenSP library independently upgradable.
327
328-30/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
329+30/10/2002 Benoit Grégoire <benoitg@coeus.ca>
330 * configure.in:
331 Apply Derek Atkins <warlord@MIT.EDU> patch needed to build on
332 > RH7.3 using the "distributed" version of openjade.
333
334-29/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
335+29/10/2002 Benoit Grégoire <benoitg@coeus.ca>
336 * lib/ofx_preproc.cpp doc/tag_striper_test.txt:
337 Proprietary tag striper is now much smarter and read routines have been fixed. Importing a file written on a single line should now be possible.
338 Added a test file for the proprietary tag striper .
339
340-29/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
341+29/10/2002 Benoit Grégoire <benoitg@coeus.ca>
342 * configure.in: Work around autoconf 2.1 not supporting AC_LANG()
343
344-21/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
345+21/10/2002 Benoit Grégoire <benoitg@coeus.ca>
346 * ofxdump/ofxdump.cpp: Add support for invtranstype in ofx_proc_transaction_cb()
347
348-21/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
349+21/10/2002 Benoit Grégoire <benoitg@coeus.ca>
350 * lib/ofx_preproc.cpp: Abort if DTD was not found
351
352-20/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
353+20/10/2002 Benoit Grégoire <benoitg@coeus.ca>
354 * Fix debug output
355 * Begin fixing ofx2qif for the new transaction ordering code
356
357-17/10/2002 Benoit Grégoire <bock@step.polymtl.ca>
358+17/10/2002 Benoit Grégoire <benoitg@coeus.ca>
359 * Implemented internal container trees, allowing transaction reordering and security lookups
360 * Complete investment transaction support
361 * Converted the build system to automake/autoconf, mostly contributed by "Peter O'Gorman" <peter@pogma.com>
362
363=== modified file 'INSTALL'
364--- INSTALL 2008-08-08 05:14:15 +0000
365+++ INSTALL 2011-04-19 18:04:29 +0000
366@@ -1,16 +1,25 @@
367 Installation Instructions
368 *************************
369
370-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
371-Software Foundation, Inc.
372+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
373+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
374
375-This file is free documentation; the Free Software Foundation gives
376-unlimited permission to copy, distribute and modify it.
377+ Copying and distribution of this file, with or without modification,
378+are permitted in any medium without royalty provided the copyright
379+notice and this notice are preserved. This file is offered as-is,
380+without warranty of any kind.
381
382 Basic Installation
383 ==================
384
385-These are generic installation instructions.
386+ Briefly, the shell commands `./configure; make; make install' should
387+configure, build, and install this package. The following
388+more-detailed instructions are generic; see the `README' file for
389+instructions specific to this package. Some packages provide this
390+`INSTALL' file but do not implement all of the features documented
391+below. The lack of an optional feature in a given package is not
392+necessarily a bug. More recommendations for GNU packages can be found
393+in *note Makefile Conventions: (standards)Makefile Conventions.
394
395 The `configure' shell script attempts to guess correct values for
396 various system-dependent variables used during compilation. It uses
397@@ -23,9 +32,9 @@
398
399 It can also use an optional file (typically called `config.cache'
400 and enabled with `--cache-file=config.cache' or simply `-C') that saves
401-the results of its tests to speed up reconfiguring. (Caching is
402+the results of its tests to speed up reconfiguring. Caching is
403 disabled by default to prevent problems with accidental use of stale
404-cache files.)
405+cache files.
406
407 If you need to do unusual things to compile the package, please try
408 to figure out how `configure' could check whether to do them, and mail
409@@ -35,30 +44,37 @@
410 may remove or edit it.
411
412 The file `configure.ac' (or `configure.in') is used to create
413-`configure' by a program called `autoconf'. You only need
414-`configure.ac' if you want to change it or regenerate `configure' using
415-a newer version of `autoconf'.
416+`configure' by a program called `autoconf'. You need `configure.ac' if
417+you want to change it or regenerate `configure' using a newer version
418+of `autoconf'.
419
420-The simplest way to compile this package is:
421+ The simplest way to compile this package is:
422
423 1. `cd' to the directory containing the package's source code and type
424- `./configure' to configure the package for your system. If you're
425- using `csh' on an old version of System V, you might need to type
426- `sh ./configure' instead to prevent `csh' from trying to execute
427- `configure' itself.
428+ `./configure' to configure the package for your system.
429
430- Running `configure' takes awhile. While running, it prints some
431- messages telling which features it is checking for.
432+ Running `configure' might take a while. While running, it prints
433+ some messages telling which features it is checking for.
434
435 2. Type `make' to compile the package.
436
437 3. Optionally, type `make check' to run any self-tests that come with
438- the package.
439+ the package, generally using the just-built uninstalled binaries.
440
441 4. Type `make install' to install the programs and any data files and
442- documentation.
443-
444- 5. You can remove the program binaries and object files from the
445+ documentation. When installing into a prefix owned by root, it is
446+ recommended that the package be configured and built as a regular
447+ user, and only the `make install' phase executed with root
448+ privileges.
449+
450+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
451+ this time using the binaries in their final installed location.
452+ This target does not install anything. Running this target as a
453+ regular user, particularly if the prior `make install' required
454+ root privileges, verifies that the installation completed
455+ correctly.
456+
457+ 6. You can remove the program binaries and object files from the
458 source code directory by typing `make clean'. To also remove the
459 files that `configure' created (so you can compile the package for
460 a different kind of computer), type `make distclean'. There is
461@@ -67,45 +83,69 @@
462 all sorts of other programs in order to regenerate files that came
463 with the distribution.
464
465+ 7. Often, you can also type `make uninstall' to remove the installed
466+ files again. In practice, not all packages have tested that
467+ uninstallation works correctly, even though it is required by the
468+ GNU Coding Standards.
469+
470+ 8. Some packages, particularly those that use Automake, provide `make
471+ distcheck', which can by used by developers to test that all other
472+ targets like `make install' and `make uninstall' work correctly.
473+ This target is generally not run by end users.
474+
475 Compilers and Options
476 =====================
477
478-Some systems require unusual options for compilation or linking that the
479-`configure' script does not know about. Run `./configure --help' for
480-details on some of the pertinent environment variables.
481+ Some systems require unusual options for compilation or linking that
482+the `configure' script does not know about. Run `./configure --help'
483+for details on some of the pertinent environment variables.
484
485 You can give `configure' initial values for configuration parameters
486 by setting variables in the command line or in the environment. Here
487 is an example:
488
489- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
490+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
491
492 *Note Defining Variables::, for more details.
493
494 Compiling For Multiple Architectures
495 ====================================
496
497-You can compile the package for more than one kind of computer at the
498+ You can compile the package for more than one kind of computer at the
499 same time, by placing the object files for each architecture in their
500-own directory. To do this, you must use a version of `make' that
501-supports the `VPATH' variable, such as GNU `make'. `cd' to the
502+own directory. To do this, you can use GNU `make'. `cd' to the
503 directory where you want the object files and executables to go and run
504 the `configure' script. `configure' automatically checks for the
505-source code in the directory that `configure' is in and in `..'.
506-
507- If you have to use a `make' that does not support the `VPATH'
508-variable, you have to compile the package for one architecture at a
509-time in the source code directory. After you have installed the
510-package for one architecture, use `make distclean' before reconfiguring
511-for another architecture.
512+source code in the directory that `configure' is in and in `..'. This
513+is known as a "VPATH" build.
514+
515+ With a non-GNU `make', it is safer to compile the package for one
516+architecture at a time in the source code directory. After you have
517+installed the package for one architecture, use `make distclean' before
518+reconfiguring for another architecture.
519+
520+ On MacOS X 10.5 and later systems, you can create libraries and
521+executables that work on multiple system types--known as "fat" or
522+"universal" binaries--by specifying multiple `-arch' options to the
523+compiler but only a single `-arch' option to the preprocessor. Like
524+this:
525+
526+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
527+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
528+ CPP="gcc -E" CXXCPP="g++ -E"
529+
530+ This is not guaranteed to produce working output in all cases, you
531+may have to build one architecture at a time and combine the results
532+using the `lipo' tool if you have problems.
533
534 Installation Names
535 ==================
536
537-By default, `make install' installs the package's commands under
538+ By default, `make install' installs the package's commands under
539 `/usr/local/bin', include files under `/usr/local/include', etc. You
540 can specify an installation prefix other than `/usr/local' by giving
541-`configure' the option `--prefix=PREFIX'.
542+`configure' the option `--prefix=PREFIX', where PREFIX must be an
543+absolute file name.
544
545 You can specify separate installation prefixes for
546 architecture-specific files and architecture-independent files. If you
547@@ -116,16 +156,47 @@
548 In addition, if you use an unusual directory layout you can give
549 options like `--bindir=DIR' to specify different values for particular
550 kinds of files. Run `configure --help' for a list of the directories
551-you can set and what kinds of files go in them.
552+you can set and what kinds of files go in them. In general, the
553+default for these options is expressed in terms of `${prefix}', so that
554+specifying just `--prefix' will affect all of the other directory
555+specifications that were not explicitly provided.
556+
557+ The most portable way to affect installation locations is to pass the
558+correct locations to `configure'; however, many packages provide one or
559+both of the following shortcuts of passing variable assignments to the
560+`make install' command line to change installation locations without
561+having to reconfigure or recompile.
562+
563+ The first method involves providing an override variable for each
564+affected directory. For example, `make install
565+prefix=/alternate/directory' will choose an alternate location for all
566+directory configuration variables that were expressed in terms of
567+`${prefix}'. Any directories that were specified during `configure',
568+but not in terms of `${prefix}', must each be overridden at install
569+time for the entire installation to be relocated. The approach of
570+makefile variable overrides for each directory variable is required by
571+the GNU Coding Standards, and ideally causes no recompilation.
572+However, some platforms have known limitations with the semantics of
573+shared libraries that end up requiring recompilation when using this
574+method, particularly noticeable in packages that use GNU Libtool.
575+
576+ The second method involves providing the `DESTDIR' variable. For
577+example, `make install DESTDIR=/alternate/directory' will prepend
578+`/alternate/directory' before all installation names. The approach of
579+`DESTDIR' overrides is not required by the GNU Coding Standards, and
580+does not work on platforms that have drive letters. On the other hand,
581+it does better at avoiding recompilation issues, and works well even
582+when some directory options were not specified in terms of `${prefix}'
583+at `configure' time.
584+
585+Optional Features
586+=================
587
588 If the package supports it, you can cause programs to be installed
589 with an extra prefix or suffix on their names by giving `configure' the
590 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
591
592-Optional Features
593-=================
594-
595-Some packages pay attention to `--enable-FEATURE' options to
596+ Some packages pay attention to `--enable-FEATURE' options to
597 `configure', where FEATURE indicates an optional part of the package.
598 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
599 is something like `gnu-as' or `x' (for the X Window System). The
600@@ -137,14 +208,53 @@
601 you can use the `configure' options `--x-includes=DIR' and
602 `--x-libraries=DIR' to specify their locations.
603
604+ Some packages offer the ability to configure how verbose the
605+execution of `make' will be. For these packages, running `./configure
606+--enable-silent-rules' sets the default to minimal output, which can be
607+overridden with `make V=1'; while running `./configure
608+--disable-silent-rules' sets the default to verbose, which can be
609+overridden with `make V=0'.
610+
611+Particular systems
612+==================
613+
614+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
615+CC is not installed, it is recommended to use the following options in
616+order to use an ANSI C compiler:
617+
618+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
619+
620+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
621+
622+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
623+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
624+a workaround. If GNU CC is not installed, it is therefore recommended
625+to try
626+
627+ ./configure CC="cc"
628+
629+and if that doesn't work, try
630+
631+ ./configure CC="cc -nodtk"
632+
633+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
634+directory contains several dysfunctional programs; working variants of
635+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
636+in your `PATH', put it _after_ `/usr/bin'.
637+
638+ On Haiku, software installed for all users goes in `/boot/common',
639+not `/usr/local'. It is recommended to use the following options:
640+
641+ ./configure --prefix=/boot/common
642+
643 Specifying the System Type
644 ==========================
645
646-There may be some features `configure' cannot figure out automatically,
647-but needs to determine by the type of machine the package will run on.
648-Usually, assuming the package is built to be run on the _same_
649-architectures, `configure' can figure that out, but if it prints a
650-message saying it cannot guess the machine type, give it the
651+ There may be some features `configure' cannot figure out
652+automatically, but needs to determine by the type of machine the package
653+will run on. Usually, assuming the package is built to be run on the
654+_same_ architectures, `configure' can figure that out, but if it prints
655+a message saying it cannot guess the machine type, give it the
656 `--build=TYPE' option. TYPE can either be a short name for the system
657 type, such as `sun4', or a canonical name which has the form:
658
659@@ -152,7 +262,8 @@
660
661 where SYSTEM can have one of these forms:
662
663- OS KERNEL-OS
664+ OS
665+ KERNEL-OS
666
667 See the file `config.sub' for the possible values of each field. If
668 `config.sub' isn't included in this package, then this package doesn't
669@@ -170,9 +281,9 @@
670 Sharing Defaults
671 ================
672
673-If you want to set default values for `configure' scripts to share, you
674-can create a site shell script called `config.site' that gives default
675-values for variables like `CC', `cache_file', and `prefix'.
676+ If you want to set default values for `configure' scripts to share,
677+you can create a site shell script called `config.site' that gives
678+default values for variables like `CC', `cache_file', and `prefix'.
679 `configure' looks for `PREFIX/share/config.site' if it exists, then
680 `PREFIX/etc/config.site' if it exists. Or, you can set the
681 `CONFIG_SITE' environment variable to the location of the site script.
682@@ -181,7 +292,7 @@
683 Defining Variables
684 ==================
685
686-Variables not defined in a site shell script can be set in the
687+ Variables not defined in a site shell script can be set in the
688 environment passed to `configure'. However, some packages may run
689 configure again during the build, and the customized values of these
690 variables may be lost. In order to avoid this problem, you should set
691@@ -190,21 +301,29 @@
692 ./configure CC=/usr/local2/bin/gcc
693
694 causes the specified `gcc' to be used as the C compiler (unless it is
695-overridden in the site shell script). Here is a another example:
696-
697- /bin/bash ./configure CONFIG_SHELL=/bin/bash
698-
699-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
700-configuration-related scripts to be executed by `/bin/bash'.
701+overridden in the site shell script).
702+
703+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
704+an Autoconf bug. Until the bug is fixed you can use this workaround:
705+
706+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
707
708 `configure' Invocation
709 ======================
710
711-`configure' recognizes the following options to control how it operates.
712+ `configure' recognizes the following options to control how it
713+operates.
714
715 `--help'
716 `-h'
717- Print a summary of the options to `configure', and exit.
718+ Print a summary of all of the options to `configure', and exit.
719+
720+`--help=short'
721+`--help=recursive'
722+ Print a summary of the options unique to this package's
723+ `configure', and exit. The `short' variant lists options used
724+ only in the top level, while the `recursive' variant lists options
725+ also present in any nested packages.
726
727 `--version'
728 `-V'
729@@ -231,6 +350,16 @@
730 Look for the package's source code in directory DIR. Usually
731 `configure' can determine that directory automatically.
732
733+`--prefix=DIR'
734+ Use DIR as the installation prefix. *note Installation Names::
735+ for more details, including other options available for fine-tuning
736+ the installation locations.
737+
738+`--no-create'
739+`-n'
740+ Run the configure checks, but stop before creating any output
741+ files.
742+
743 `configure' also accepts some other, not widely useful, options. Run
744 `configure --help' for more details.
745
746
747=== modified file 'Makefile.am'
748--- Makefile.am 2008-08-08 05:14:15 +0000
749+++ Makefile.am 2011-04-19 18:04:29 +0000
750@@ -1,9 +1,10 @@
751 if BUILD_OFXCONNECT
752- MAYBE_OFXCONNECT = ofxconnect
753+ MAYBE_OFXCONNECT = ofxconnect
754 endif
755+DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
756 SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
757
758-docdir = ${prefix}/share/doc/libofx
759+docdir = $(datadir)/doc/libofx
760
761 doc_DATA = \
762 AUTHORS \
763@@ -19,6 +20,7 @@
764 libofx.spec \
765 libofx.pc \
766 totest.txt \
767+ libofx.lsm.in \
768 libofx.lsm
769
770 pkgconfigdir=$(libdir)/pkgconfig
771
772=== modified file 'Makefile.in'
773--- Makefile.in 2008-08-08 05:14:15 +0000
774+++ Makefile.in 2011-04-19 18:04:29 +0000
775@@ -1,8 +1,9 @@
776-# Makefile.in generated by automake 1.9.6 from Makefile.am.
777+# Makefile.in generated by automake 1.11.1 from Makefile.am.
778 # @configure_input@
779
780 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
781-# 2003, 2004, 2005 Free Software Foundation, Inc.
782+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
783+# Inc.
784 # This Makefile.in is free software; the Free Software Foundation
785 # gives unlimited permission to copy and/or distribute it,
786 # with or without modifications, as long as this notice is preserved.
787@@ -14,15 +15,12 @@
788
789 @SET_MAKE@
790
791-srcdir = @srcdir@
792-top_srcdir = @top_srcdir@
793 VPATH = @srcdir@
794 pkgdatadir = $(datadir)/@PACKAGE@
795+pkgincludedir = $(includedir)/@PACKAGE@
796 pkglibdir = $(libdir)/@PACKAGE@
797-pkgincludedir = $(includedir)/@PACKAGE@
798-top_builddir = .
799+pkglibexecdir = $(libexecdir)/@PACKAGE@
800 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
801-INSTALL = @INSTALL@
802 install_sh_DATA = $(install_sh) -c -m 644
803 install_sh_PROGRAM = $(install_sh) -c
804 install_sh_SCRIPT = $(install_sh) -c
805@@ -36,58 +34,101 @@
806 POST_UNINSTALL = :
807 build_triplet = @build@
808 host_triplet = @host@
809+subdir = .
810 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
811 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
812- $(srcdir)/libofx.pc.in $(srcdir)/libofx.spec.in \
813- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
814- config/config.guess config/config.sub config/depcomp \
815- config/install-sh config/ltmain.sh config/missing
816-subdir = .
817+ $(srcdir)/libofx.lsm.in $(srcdir)/libofx.pc.in \
818+ $(srcdir)/libofx.spec.in $(top_srcdir)/configure AUTHORS \
819+ COPYING ChangeLog INSTALL NEWS config/config.guess \
820+ config/config.sub config/depcomp config/install-sh \
821+ config/ltmain.sh config/missing
822 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
823 am__aclocal_m4_deps = $(top_srcdir)/m4/os.m4 $(top_srcdir)/libcurl.m4 \
824 $(top_srcdir)/configure.in
825 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
826 $(ACLOCAL_M4)
827 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
828- configure.lineno configure.status.lineno
829+ configure.lineno config.status.lineno
830 mkinstalldirs = $(install_sh) -d
831 CONFIG_HEADER = config.h
832-CONFIG_CLEAN_FILES = libofx.spec libofx.pc
833+CONFIG_CLEAN_FILES = libofx.spec libofx.pc libofx.lsm
834+CONFIG_CLEAN_VPATH_FILES =
835 SOURCES =
836 DIST_SOURCES =
837 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
838 html-recursive info-recursive install-data-recursive \
839- install-exec-recursive install-info-recursive \
840- install-recursive installcheck-recursive installdirs-recursive \
841- pdf-recursive ps-recursive uninstall-info-recursive \
842- uninstall-recursive
843+ install-dvi-recursive install-exec-recursive \
844+ install-html-recursive install-info-recursive \
845+ install-pdf-recursive install-ps-recursive install-recursive \
846+ installcheck-recursive installdirs-recursive pdf-recursive \
847+ ps-recursive uninstall-recursive
848 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
849 am__vpath_adj = case $$p in \
850 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
851 *) f=$$p;; \
852 esac;
853-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
854+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
855+am__install_max = 40
856+am__nobase_strip_setup = \
857+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
858+am__nobase_strip = \
859+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
860+am__nobase_list = $(am__nobase_strip_setup); \
861+ for p in $$list; do echo "$$p $$p"; done | \
862+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
863+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
864+ if (++n[$$2] == $(am__install_max)) \
865+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
866+ END { for (dir in files) print dir, files[dir] }'
867+am__base_list = \
868+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
869+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
870 am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"
871-docDATA_INSTALL = $(INSTALL_DATA)
872-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
873 DATA = $(doc_DATA) $(pkgconfig_DATA)
874+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
875+ distclean-recursive maintainer-clean-recursive
876+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
877+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
878+ distdir dist dist-all distcheck
879 ETAGS = etags
880 CTAGS = ctags
881-DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
882 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
883 distdir = $(PACKAGE)-$(VERSION)
884 top_distdir = $(distdir)
885 am__remove_distdir = \
886- { test ! -d $(distdir) \
887- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
888- && rm -fr $(distdir); }; }
889+ { test ! -d "$(distdir)" \
890+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
891+ && rm -fr "$(distdir)"; }; }
892+am__relativize = \
893+ dir0=`pwd`; \
894+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
895+ sed_rest='s,^[^/]*/*,,'; \
896+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
897+ sed_butlast='s,/*[^/]*$$,,'; \
898+ while test -n "$$dir1"; do \
899+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
900+ if test "$$first" != "."; then \
901+ if test "$$first" = ".."; then \
902+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
903+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
904+ else \
905+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
906+ if test "$$first2" = "$$first"; then \
907+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
908+ else \
909+ dir2="../$$dir2"; \
910+ fi; \
911+ dir0="$$dir0"/"$$first"; \
912+ fi; \
913+ fi; \
914+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
915+ done; \
916+ reldir="$$dir2"
917 DIST_ARCHIVES = $(distdir).tar.gz
918 GZIP_ENV = --best
919 distuninstallcheck_listfiles = find . -type f -print
920 distcleancheck_listfiles = find . -type f -print
921 ACLOCAL = @ACLOCAL@
922-AMDEP_FALSE = @AMDEP_FALSE@
923-AMDEP_TRUE = @AMDEP_TRUE@
924 AMTAR = @AMTAR@
925 AR = @AR@
926 AS = @AS@
927@@ -95,8 +136,6 @@
928 AUTOHEADER = @AUTOHEADER@
929 AUTOMAKE = @AUTOMAKE@
930 AWK = @AWK@
931-BUILD_OFXCONNECT_FALSE = @BUILD_OFXCONNECT_FALSE@
932-BUILD_OFXCONNECT_TRUE = @BUILD_OFXCONNECT_TRUE@
933 CC = @CC@
934 CCDEPMODE = @CCDEPMODE@
935 CFLAGS = @CFLAGS@
936@@ -110,27 +149,25 @@
937 DEFS = @DEFS@
938 DEPDIR = @DEPDIR@
939 DLLTOOL = @DLLTOOL@
940-DOC_FALSE = @DOC_FALSE@
941-DOC_TRUE = @DOC_TRUE@
942 DOT = @DOT@
943 DOXYGEN = @DOXYGEN@
944-ECHO = @ECHO@
945+DSYMUTIL = @DSYMUTIL@
946+DUMPBIN = @DUMPBIN@
947 ECHO_C = @ECHO_C@
948 ECHO_N = @ECHO_N@
949 ECHO_T = @ECHO_T@
950 EGREP = @EGREP@
951-ENABLE_DOXYGEN_FALSE = @ENABLE_DOXYGEN_FALSE@
952-ENABLE_DOXYGEN_TRUE = @ENABLE_DOXYGEN_TRUE@
953 EXEEXT = @EXEEXT@
954-F77 = @F77@
955-FFLAGS = @FFLAGS@
956+FGREP = @FGREP@
957 GREP = @GREP@
958 ICONV_LIBS = @ICONV_LIBS@
959+INSTALL = @INSTALL@
960 INSTALL_DATA = @INSTALL_DATA@
961 INSTALL_DLL_TARGET = @INSTALL_DLL_TARGET@
962 INSTALL_PROGRAM = @INSTALL_PROGRAM@
963 INSTALL_SCRIPT = @INSTALL_SCRIPT@
964 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
965+LD = @LD@
966 LDFLAGS = @LDFLAGS@
967 LIBCURL = @LIBCURL@
968 LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
969@@ -149,48 +186,49 @@
970 LIBTOOL = @LIBTOOL@
971 LIBXMLPP_CFLAGS = @LIBXMLPP_CFLAGS@
972 LIBXMLPP_LIBS = @LIBXMLPP_LIBS@
973+LIPO = @LIPO@
974 LN_S = @LN_S@
975 LTLIBOBJS = @LTLIBOBJS@
976-MAINT = @MAINT@
977-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
978-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
979 MAKEINFO = @MAKEINFO@
980 MAKE_DLL_TARGET = @MAKE_DLL_TARGET@
981-NO_GETOPTLONG_FALSE = @NO_GETOPTLONG_FALSE@
982-NO_GETOPTLONG_TRUE = @NO_GETOPTLONG_TRUE@
983+MKDIR_P = @MKDIR_P@
984+NM = @NM@
985+NMEDIT = @NMEDIT@
986 OBJDUMP = @OBJDUMP@
987 OBJEXT = @OBJEXT@
988 OPENSPINCLUDES = @OPENSPINCLUDES@
989 OPENSPLIBS = @OPENSPLIBS@
990 OSYSTEM = @OSYSTEM@
991 OS_TYPE = @OS_TYPE@
992+OTOOL = @OTOOL@
993+OTOOL64 = @OTOOL64@
994 PACKAGE = @PACKAGE@
995 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
996 PACKAGE_NAME = @PACKAGE_NAME@
997 PACKAGE_STRING = @PACKAGE_STRING@
998 PACKAGE_TARNAME = @PACKAGE_TARNAME@
999+PACKAGE_URL = @PACKAGE_URL@
1000 PACKAGE_VERSION = @PACKAGE_VERSION@
1001 PATH_SEPARATOR = @PATH_SEPARATOR@
1002 PKG_CONFIG = @PKG_CONFIG@
1003+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
1004+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
1005 QT_CFLAGS = @QT_CFLAGS@
1006 RANLIB = @RANLIB@
1007-RC = @RC@
1008 SED = @SED@
1009 SET_MAKE = @SET_MAKE@
1010 SHELL = @SHELL@
1011 STRIP = @STRIP@
1012-USE_GENGETOPT_FALSE = @USE_GENGETOPT_FALSE@
1013-USE_GENGETOPT_TRUE = @USE_GENGETOPT_TRUE@
1014 VERSION = @VERSION@
1015 WITH_ICONV = @WITH_ICONV@
1016 _libcurl_config = @_libcurl_config@
1017+abs_builddir = @abs_builddir@
1018+abs_srcdir = @abs_srcdir@
1019+abs_top_builddir = @abs_top_builddir@
1020+abs_top_srcdir = @abs_top_srcdir@
1021 ac_ct_CC = @ac_ct_CC@
1022 ac_ct_CXX = @ac_ct_CXX@
1023-ac_ct_F77 = @ac_ct_F77@
1024-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
1025-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
1026-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
1027-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
1028+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
1029 am__include = @am__include@
1030 am__leading_dot = @am__leading_dot@
1031 am__quote = @am__quote@
1032@@ -202,9 +240,10 @@
1033 build_cpu = @build_cpu@
1034 build_os = @build_os@
1035 build_vendor = @build_vendor@
1036+builddir = @builddir@
1037 datadir = @datadir@
1038 datarootdir = @datarootdir@
1039-docdir = ${prefix}/share/doc/libofx
1040+docdir = $(datadir)/doc/libofx
1041 dvidir = @dvidir@
1042 enable_dot = @enable_dot@
1043 enable_html_docs = @enable_html_docs@
1044@@ -224,6 +263,7 @@
1045 libexecdir = @libexecdir@
1046 localedir = @localedir@
1047 localstatedir = @localstatedir@
1048+lt_ECHO = @lt_ECHO@
1049 mandir = @mandir@
1050 mkdir_p = @mkdir_p@
1051 ofxconnect = @ofxconnect@
1052@@ -234,9 +274,14 @@
1053 psdir = @psdir@
1054 sbindir = @sbindir@
1055 sharedstatedir = @sharedstatedir@
1056+srcdir = @srcdir@
1057 sysconfdir = @sysconfdir@
1058 target_alias = @target_alias@
1059+top_build_prefix = @top_build_prefix@
1060+top_builddir = @top_builddir@
1061+top_srcdir = @top_srcdir@
1062 @BUILD_OFXCONNECT_TRUE@MAYBE_OFXCONNECT = ofxconnect
1063+DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
1064 SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
1065 doc_DATA = \
1066 AUTHORS \
1067@@ -252,6 +297,7 @@
1068 libofx.spec \
1069 libofx.pc \
1070 totest.txt \
1071+ libofx.lsm.in \
1072 libofx.lsm
1073
1074 pkgconfigdir = $(libdir)/pkgconfig
1075@@ -262,19 +308,19 @@
1076 .SUFFIXES:
1077 am--refresh:
1078 @:
1079-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
1080+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
1081 @for dep in $?; do \
1082 case '$(am__configure_deps)' in \
1083 *$$dep*) \
1084- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
1085- cd $(srcdir) && $(AUTOMAKE) --gnu \
1086+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
1087+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
1088 && exit 0; \
1089 exit 1;; \
1090 esac; \
1091 done; \
1092- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
1093- cd $(top_srcdir) && \
1094- $(AUTOMAKE) --gnu Makefile
1095+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
1096+ $(am__cd) $(top_srcdir) && \
1097+ $(AUTOMAKE) --gnu Makefile
1098 .PRECIOUS: Makefile
1099 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1100 @case '$?' in \
1101@@ -289,22 +335,23 @@
1102 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
1103 $(SHELL) ./config.status --recheck
1104
1105-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1106- cd $(srcdir) && $(AUTOCONF)
1107-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1108- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1109+$(top_srcdir)/configure: $(am__configure_deps)
1110+ $(am__cd) $(srcdir) && $(AUTOCONF)
1111+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1112+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1113+$(am__aclocal_m4_deps):
1114
1115 config.h: stamp-h1
1116 @if test ! -f $@; then \
1117 rm -f stamp-h1; \
1118- $(MAKE) stamp-h1; \
1119+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
1120 else :; fi
1121
1122 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
1123 @rm -f stamp-h1
1124 cd $(top_builddir) && $(SHELL) ./config.status config.h
1125-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1126- cd $(top_srcdir) && $(AUTOHEADER)
1127+$(srcdir)/config.h.in: $(am__configure_deps)
1128+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
1129 rm -f stamp-h1
1130 touch $@
1131
1132@@ -314,6 +361,8 @@
1133 cd $(top_builddir) && $(SHELL) ./config.status $@
1134 libofx.pc: $(top_builddir)/config.status $(srcdir)/libofx.pc.in
1135 cd $(top_builddir) && $(SHELL) ./config.status $@
1136+libofx.lsm: $(top_builddir)/config.status $(srcdir)/libofx.lsm.in
1137+ cd $(top_builddir) && $(SHELL) ./config.status $@
1138
1139 mostlyclean-libtool:
1140 -rm -f *.lo
1141@@ -322,42 +371,47 @@
1142 -rm -rf .libs _libs
1143
1144 distclean-libtool:
1145- -rm -f libtool
1146-uninstall-info-am:
1147+ -rm -f libtool config.lt
1148 install-docDATA: $(doc_DATA)
1149 @$(NORMAL_INSTALL)
1150- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
1151- @list='$(doc_DATA)'; for p in $$list; do \
1152+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
1153+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
1154+ for p in $$list; do \
1155 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1156- f=$(am__strip_dir) \
1157- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
1158- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
1159+ echo "$$d$$p"; \
1160+ done | $(am__base_list) | \
1161+ while read files; do \
1162+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
1163+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
1164 done
1165
1166 uninstall-docDATA:
1167 @$(NORMAL_UNINSTALL)
1168- @list='$(doc_DATA)'; for p in $$list; do \
1169- f=$(am__strip_dir) \
1170- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
1171- rm -f "$(DESTDIR)$(docdir)/$$f"; \
1172- done
1173+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
1174+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1175+ test -n "$$files" || exit 0; \
1176+ echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
1177+ cd "$(DESTDIR)$(docdir)" && rm -f $$files
1178 install-pkgconfigDATA: $(pkgconfig_DATA)
1179 @$(NORMAL_INSTALL)
1180- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
1181- @list='$(pkgconfig_DATA)'; for p in $$list; do \
1182+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
1183+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1184+ for p in $$list; do \
1185 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1186- f=$(am__strip_dir) \
1187- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
1188- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
1189+ echo "$$d$$p"; \
1190+ done | $(am__base_list) | \
1191+ while read files; do \
1192+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
1193+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
1194 done
1195
1196 uninstall-pkgconfigDATA:
1197 @$(NORMAL_UNINSTALL)
1198- @list='$(pkgconfig_DATA)'; for p in $$list; do \
1199- f=$(am__strip_dir) \
1200- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
1201- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
1202- done
1203+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
1204+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1205+ test -n "$$files" || exit 0; \
1206+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
1207+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
1208
1209 # This directory's subdirectories are mostly independent; you can cd
1210 # into them and run `make' without going through this Makefile.
1211@@ -366,7 +420,7 @@
1212 # (which will cause the Makefiles to be regenerated when you run `make');
1213 # (2) otherwise, pass the desired values on the `make' command line.
1214 $(RECURSIVE_TARGETS):
1215- @failcom='exit 1'; \
1216+ @fail= failcom='exit 1'; \
1217 for f in x $$MAKEFLAGS; do \
1218 case $$f in \
1219 *=* | --[!k]*);; \
1220@@ -383,16 +437,15 @@
1221 else \
1222 local_target="$$target"; \
1223 fi; \
1224- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1225+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1226 || eval $$failcom; \
1227 done; \
1228 if test "$$dot_seen" = "no"; then \
1229 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
1230 fi; test -z "$$fail"
1231
1232-mostlyclean-recursive clean-recursive distclean-recursive \
1233-maintainer-clean-recursive:
1234- @failcom='exit 1'; \
1235+$(RECURSIVE_CLEAN_TARGETS):
1236+ @fail= failcom='exit 1'; \
1237 for f in x $$MAKEFLAGS; do \
1238 case $$f in \
1239 *=* | --[!k]*);; \
1240@@ -418,16 +471,16 @@
1241 else \
1242 local_target="$$target"; \
1243 fi; \
1244- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1245+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1246 || eval $$failcom; \
1247 done && test -z "$$fail"
1248 tags-recursive:
1249 list='$(SUBDIRS)'; for subdir in $$list; do \
1250- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1251+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1252 done
1253 ctags-recursive:
1254 list='$(SUBDIRS)'; for subdir in $$list; do \
1255- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1256+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1257 done
1258
1259 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1260@@ -435,14 +488,14 @@
1261 unique=`for i in $$list; do \
1262 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1263 done | \
1264- $(AWK) ' { files[$$0] = 1; } \
1265- END { for (i in files) print i; }'`; \
1266+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1267+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1268 mkid -fID $$unique
1269 tags: TAGS
1270
1271 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1272 $(TAGS_FILES) $(LISP)
1273- tags=; \
1274+ set x; \
1275 here=`pwd`; \
1276 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1277 include_option=--etags-include; \
1278@@ -454,93 +507,114 @@
1279 list='$(SUBDIRS)'; for subdir in $$list; do \
1280 if test "$$subdir" = .; then :; else \
1281 test ! -f $$subdir/TAGS || \
1282- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
1283+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1284 fi; \
1285 done; \
1286 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1287 unique=`for i in $$list; do \
1288 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1289 done | \
1290- $(AWK) ' { files[$$0] = 1; } \
1291- END { for (i in files) print i; }'`; \
1292- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1293+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1294+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1295+ shift; \
1296+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1297 test -n "$$unique" || unique=$$empty_fix; \
1298- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1299- $$tags $$unique; \
1300+ if test $$# -gt 0; then \
1301+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1302+ "$$@" $$unique; \
1303+ else \
1304+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1305+ $$unique; \
1306+ fi; \
1307 fi
1308 ctags: CTAGS
1309 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1310 $(TAGS_FILES) $(LISP)
1311- tags=; \
1312- here=`pwd`; \
1313 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1314 unique=`for i in $$list; do \
1315 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1316 done | \
1317- $(AWK) ' { files[$$0] = 1; } \
1318- END { for (i in files) print i; }'`; \
1319- test -z "$(CTAGS_ARGS)$$tags$$unique" \
1320+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1321+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1322+ test -z "$(CTAGS_ARGS)$$unique" \
1323 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1324- $$tags $$unique
1325+ $$unique
1326
1327 GTAGS:
1328 here=`$(am__cd) $(top_builddir) && pwd` \
1329- && cd $(top_srcdir) \
1330- && gtags -i $(GTAGS_ARGS) $$here
1331+ && $(am__cd) $(top_srcdir) \
1332+ && gtags -i $(GTAGS_ARGS) "$$here"
1333
1334 distclean-tags:
1335 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1336
1337 distdir: $(DISTFILES)
1338 $(am__remove_distdir)
1339- mkdir $(distdir)
1340- $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/inc $(distdir)/lib $(distdir)/m4
1341- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
1342- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
1343- list='$(DISTFILES)'; for file in $$list; do \
1344- case $$file in \
1345- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
1346- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
1347- esac; \
1348+ test -d "$(distdir)" || mkdir "$(distdir)"
1349+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1350+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1351+ list='$(DISTFILES)'; \
1352+ dist_files=`for file in $$list; do echo $$file; done | \
1353+ sed -e "s|^$$srcdirstrip/||;t" \
1354+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1355+ case $$dist_files in \
1356+ */*) $(MKDIR_P) `echo "$$dist_files" | \
1357+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1358+ sort -u` ;; \
1359+ esac; \
1360+ for file in $$dist_files; do \
1361 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1362- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
1363- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
1364- dir="/$$dir"; \
1365- $(mkdir_p) "$(distdir)$$dir"; \
1366- else \
1367- dir=''; \
1368- fi; \
1369 if test -d $$d/$$file; then \
1370+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1371+ if test -d "$(distdir)/$$file"; then \
1372+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1373+ fi; \
1374 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1375- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1376+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1377+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1378 fi; \
1379- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1380+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1381 else \
1382- test -f $(distdir)/$$file \
1383- || cp -p $$d/$$file $(distdir)/$$file \
1384+ test -f "$(distdir)/$$file" \
1385+ || cp -p $$d/$$file "$(distdir)/$$file" \
1386 || exit 1; \
1387 fi; \
1388 done
1389- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1390+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1391 if test "$$subdir" = .; then :; else \
1392 test -d "$(distdir)/$$subdir" \
1393- || $(mkdir_p) "$(distdir)/$$subdir" \
1394+ || $(MKDIR_P) "$(distdir)/$$subdir" \
1395 || exit 1; \
1396- distdir=`$(am__cd) $(distdir) && pwd`; \
1397- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
1398- (cd $$subdir && \
1399+ fi; \
1400+ done
1401+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1402+ if test "$$subdir" = .; then :; else \
1403+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
1404+ $(am__relativize); \
1405+ new_distdir=$$reldir; \
1406+ dir1=$$subdir; dir2="$(top_distdir)"; \
1407+ $(am__relativize); \
1408+ new_top_distdir=$$reldir; \
1409+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
1410+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
1411+ ($(am__cd) $$subdir && \
1412 $(MAKE) $(AM_MAKEFLAGS) \
1413- top_distdir="$$top_distdir" \
1414- distdir="$$distdir/$$subdir" \
1415+ top_distdir="$$new_top_distdir" \
1416+ distdir="$$new_distdir" \
1417+ am__remove_distdir=: \
1418+ am__skip_length_check=: \
1419+ am__skip_mode_fix=: \
1420 distdir) \
1421 || exit 1; \
1422 fi; \
1423 done
1424- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1425+ -test -n "$(am__skip_mode_fix)" \
1426+ || find "$(distdir)" -type d ! -perm -755 \
1427+ -exec chmod u+rwx,go+rx {} \; -o \
1428 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1429 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1430- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
1431- || chmod -R a+r $(distdir)
1432+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1433+ || chmod -R a+r "$(distdir)"
1434 dist-gzip: distdir
1435 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1436 $(am__remove_distdir)
1437@@ -549,6 +623,14 @@
1438 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
1439 $(am__remove_distdir)
1440
1441+dist-lzma: distdir
1442+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
1443+ $(am__remove_distdir)
1444+
1445+dist-xz: distdir
1446+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
1447+ $(am__remove_distdir)
1448+
1449 dist-tarZ: distdir
1450 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
1451 $(am__remove_distdir)
1452@@ -572,13 +654,17 @@
1453 distcheck: dist
1454 case '$(DIST_ARCHIVES)' in \
1455 *.tar.gz*) \
1456- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1457+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1458 *.tar.bz2*) \
1459- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1460+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1461+ *.tar.lzma*) \
1462+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
1463+ *.tar.xz*) \
1464+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
1465 *.tar.Z*) \
1466 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1467 *.shar.gz*) \
1468- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1469+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1470 *.zip*) \
1471 unzip $(distdir).zip ;;\
1472 esac
1473@@ -586,9 +672,11 @@
1474 mkdir $(distdir)/_build
1475 mkdir $(distdir)/_inst
1476 chmod a-w $(distdir)
1477+ test -d $(distdir)/_build || exit 0; \
1478 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1479 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1480- && cd $(distdir)/_build \
1481+ && am__cwd=`pwd` \
1482+ && $(am__cd) $(distdir)/_build \
1483 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
1484 $(DISTCHECK_CONFIGURE_FLAGS) \
1485 && $(MAKE) $(AM_MAKEFLAGS) \
1486@@ -610,13 +698,15 @@
1487 && rm -rf "$$dc_destdir" \
1488 && $(MAKE) $(AM_MAKEFLAGS) dist \
1489 && rm -rf $(DIST_ARCHIVES) \
1490- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1491+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
1492+ && cd "$$am__cwd" \
1493+ || exit 1
1494 $(am__remove_distdir)
1495 @(echo "$(distdir) archives ready for distribution: "; \
1496 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
1497- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
1498+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
1499 distuninstallcheck:
1500- @cd $(distuninstallcheck_dir) \
1501+ @$(am__cd) '$(distuninstallcheck_dir)' \
1502 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
1503 || { echo "ERROR: files left after uninstall:" ; \
1504 if test -n "$(DESTDIR)"; then \
1505@@ -639,7 +729,7 @@
1506 installdirs: installdirs-recursive
1507 installdirs-am:
1508 for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
1509- test -z "$$dir" || $(mkdir_p) "$$dir"; \
1510+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1511 done
1512 install: install-recursive
1513 install-exec: install-exec-recursive
1514@@ -661,6 +751,7 @@
1515
1516 distclean-generic:
1517 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1518+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1519
1520 maintainer-clean-generic:
1521 @echo "This command is intended for maintainers to use"
1522@@ -681,18 +772,38 @@
1523
1524 html: html-recursive
1525
1526+html-am:
1527+
1528 info: info-recursive
1529
1530 info-am:
1531
1532 install-data-am: install-docDATA install-pkgconfigDATA
1533
1534+install-dvi: install-dvi-recursive
1535+
1536+install-dvi-am:
1537+
1538 install-exec-am:
1539
1540+install-html: install-html-recursive
1541+
1542+install-html-am:
1543+
1544 install-info: install-info-recursive
1545
1546+install-info-am:
1547+
1548 install-man:
1549
1550+install-pdf: install-pdf-recursive
1551+
1552+install-pdf-am:
1553+
1554+install-ps: install-ps-recursive
1555+
1556+install-ps-am:
1557+
1558 installcheck-am:
1559
1560 maintainer-clean: maintainer-clean-recursive
1561@@ -713,27 +824,28 @@
1562
1563 ps-am:
1564
1565-uninstall-am: uninstall-docDATA uninstall-info-am \
1566- uninstall-pkgconfigDATA
1567-
1568-uninstall-info: uninstall-info-recursive
1569-
1570-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
1571- check-am clean clean-generic clean-libtool clean-recursive \
1572- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
1573- dist-shar dist-tarZ dist-zip distcheck distclean \
1574- distclean-generic distclean-hdr distclean-libtool \
1575- distclean-recursive distclean-tags distcleancheck distdir \
1576+uninstall-am: uninstall-docDATA uninstall-pkgconfigDATA
1577+
1578+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
1579+ ctags-recursive install-am install-strip tags-recursive
1580+
1581+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1582+ all all-am am--refresh check check-am clean clean-generic \
1583+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1584+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
1585+ distcheck distclean distclean-generic distclean-hdr \
1586+ distclean-libtool distclean-tags distcleancheck distdir \
1587 distuninstallcheck dvi dvi-am html html-am info info-am \
1588 install install-am install-data install-data-am \
1589- install-docDATA install-exec install-exec-am install-info \
1590- install-info-am install-man install-pkgconfigDATA \
1591- install-strip installcheck installcheck-am installdirs \
1592- installdirs-am maintainer-clean maintainer-clean-generic \
1593- maintainer-clean-recursive mostlyclean mostlyclean-generic \
1594- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
1595+ install-docDATA install-dvi install-dvi-am install-exec \
1596+ install-exec-am install-html install-html-am install-info \
1597+ install-info-am install-man install-pdf install-pdf-am \
1598+ install-pkgconfigDATA install-ps install-ps-am install-strip \
1599+ installcheck installcheck-am installdirs installdirs-am \
1600+ maintainer-clean maintainer-clean-generic mostlyclean \
1601+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1602 tags tags-recursive uninstall uninstall-am uninstall-docDATA \
1603- uninstall-info-am uninstall-pkgconfigDATA
1604+ uninstall-pkgconfigDATA
1605
1606
1607 .PHONY: doc
1608@@ -744,6 +856,7 @@
1609 rpmbuild="rpm" && \
1610 if [ `rpm --version | awk '{ print $$3 }'` > /dev/null ]; then rpmbuild="rpmbuild"; fi && \
1611 $$rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
1612+
1613 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1614 # Otherwise a system limit (for SysV at least) may be exceeded.
1615 .NOEXPORT:
1616
1617=== modified file 'NEWS'
1618--- NEWS 2008-08-08 05:14:15 +0000
1619+++ NEWS 2011-04-19 18:04:29 +0000
1620@@ -1,3 +1,29 @@
1621+LibOFX 0.9.4:
1622+ - Patch to fix segfault on some malformed date formats. Inspired by Zach's patch on launchpad.
1623+ - Packages-oriented changes:
1624+ - LibOFX will now look for DTDs in env variable OFX_DTD_PATH (if present).
1625+ - Better handling of paths (tolerates trailing path separator, or lack thereof)
1626+ - No longer ignore return value of mkstemp()
1627+ - Integrate all changes in Ubuntu's package that weren't already upstream
1628+ - Move to LibXML++ 2.6, as 1.0 is deprecated
1629+ - Add generated man pages with html2man
1630+
1631+LibOFX 0.9.3:
1632+ - Fix segfault on some files containing missing closing tags (bug #2969817)
1633+
1634+LibOFX 0.9.2:
1635+ - Win32: Add gnucash patch that looks up the dtd installation directory from the current executable's location.
1636+ - Apply patch by Geert Janssens to fix a crash on invalid date format
1637+ - Apply patch by ajseward with some additional fixes to allow wraping the library in python.
1638+ - Apply patch by Thomas Baumgart which fixes bug #5 (Transaction posting date off by one)
1639+ - Apply patch by Bill Nottingham <notting@redhat.com> with various C++ include fixes for building with recent compilers.
1640+
1641+LibOFX 0.9.1:
1642+ - Add more sanity checks on string length.
1643+ - Fix gnucash crash on OFX files with non-ascii characters and very long lines. See
1644+ http://bugzilla.gnome.org/show_bug.cgi?id=528306 and
1645+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493597. Patch by Jerome Vouillon copied from the latter.
1646+
1647 LibOFX 0.9.0:
1648 - this release now exports version information thus allowing depending applications
1649 to determine the version of LibOFX to compile against
1650
1651=== modified file 'README'
1652--- README 2008-08-08 05:14:15 +0000
1653+++ README 2011-04-19 18:04:29 +0000
1654@@ -1,10 +1,10 @@
1655-Copyright (c) 2002-2003 Benoit Grégoire
1656+Copyright (c) 2002-2010 Benoit Grégoire
1657
1658 This is the LibOFX library. It is a API designed to allow applications to very easily support OFX command responses, usually provided by financial institutions. See http://www.ofx.net/ofx/default.asp for details and specification. This project was first started as my end of degree project, with the objective to add OFX support to GnuCash http://www.gnucash.org/ If you can read French, the original project presentation is included in the doc directory. I finally decided to make it into a generic library, so all OpenSource financial software can benefit.
1659
1660 LibOFX is based on the excellent OpenSP library written by James Clark, and now part of the OpenJADE http://openjade.sourceforge.net/ project. OpenSP by itself is not widely distributed. OpenJADE 1.3.1 includes a version on OpenSP that will link, however, it has some major problems with LibOFX and isn't recommended. Since LibOFX uses the generic interface to OpenSP, it should be compatible with all recent versions of OpenSP (It has been developed with OpenSP-1.5pre5). LibOFX is written in C++, but provides a C style interface usable transparently from both C and C++ using a single include file.
1661
1662-In addition to the library, two utilities are included with libofx
1663+In addition to the library, three utilities are included with libofx
1664
1665 ofxdump:
1666 ofxdump prints to stdout, in human readable form, everything the library understands about a particular ofx response file, and sends errors to stderr. It is as C++ code example and demo of the library (it uses every functions and every structures of LibOFX)
1667@@ -47,6 +47,6 @@
1668 my own bank (Desjardins). But I need people to run as many ofx files from different banks as they can thru libofx, and report the result.
1669 -This is my first attempt at writing an API. I need comments from financial software writers about inc/libofx.h What do YOU need?
1670
1671-Benoit Grégoire
1672-bock@step.polymtl.ca
1673+Benoit Grégoire
1674+benoitg@coeus.ca
1675
1676
1677=== modified file 'aclocal.m4'
1678--- aclocal.m4 2008-08-08 05:14:15 +0000
1679+++ aclocal.m4 2011-04-19 18:04:29 +0000
1680@@ -1,7 +1,7 @@
1681-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
1682+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
1683
1684 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1685-# 2005 Free Software Foundation, Inc.
1686+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1687 # This file is free software; the Free Software Foundation
1688 # gives unlimited permission to copy and/or distribute it,
1689 # with or without modifications, as long as this notice is preserved.
1690@@ -11,103 +11,196 @@
1691 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1692 # PARTICULAR PURPOSE.
1693
1694+m4_ifndef([AC_AUTOCONF_VERSION],
1695+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1696+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
1697+[m4_warning([this file was generated for autoconf 2.67.
1698+You have another version of autoconf. It may work, but is not guaranteed to.
1699+If you have problems, you may need to regenerate the build system entirely.
1700+To do so, use the procedure documented by the package, typically `autoreconf'.])])
1701+
1702 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1703-
1704-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
1705-
1706-
1707-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1708-# -----------------------------------------------------------
1709-# If this macro is not defined by Autoconf, define it here.
1710-m4_ifdef([AC_PROVIDE_IFELSE],
1711- [],
1712- [m4_define([AC_PROVIDE_IFELSE],
1713- [m4_ifdef([AC_PROVIDE_$1],
1714- [$2], [$3])])])
1715-
1716-
1717-# AC_PROG_LIBTOOL
1718-# ---------------
1719-AC_DEFUN([AC_PROG_LIBTOOL],
1720-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
1721-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
1722-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
1723- AC_PROVIDE_IFELSE([AC_PROG_CXX],
1724- [AC_LIBTOOL_CXX],
1725- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
1726- ])])
1727-dnl And a similar setup for Fortran 77 support
1728- AC_PROVIDE_IFELSE([AC_PROG_F77],
1729- [AC_LIBTOOL_F77],
1730- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
1731-])])
1732-
1733-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
1734-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
1735-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
1736- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
1737- [AC_LIBTOOL_GCJ],
1738- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
1739- [AC_LIBTOOL_GCJ],
1740- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
1741- [AC_LIBTOOL_GCJ],
1742- [ifdef([AC_PROG_GCJ],
1743- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1744- ifdef([A][M_PROG_GCJ],
1745- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1746- ifdef([LT_AC_PROG_GCJ],
1747- [define([LT_AC_PROG_GCJ],
1748- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
1749-])])# AC_PROG_LIBTOOL
1750-
1751-
1752-# _AC_PROG_LIBTOOL
1753-# ----------------
1754-AC_DEFUN([_AC_PROG_LIBTOOL],
1755-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
1756-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
1757-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
1758-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
1759+#
1760+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1761+# 2006, 2007, 2008 Free Software Foundation, Inc.
1762+# Written by Gordon Matzigkeit, 1996
1763+#
1764+# This file is free software; the Free Software Foundation gives
1765+# unlimited permission to copy and/or distribute it, with or without
1766+# modifications, as long as this notice is preserved.
1767+
1768+m4_define([_LT_COPYING], [dnl
1769+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1770+# 2006, 2007, 2008 Free Software Foundation, Inc.
1771+# Written by Gordon Matzigkeit, 1996
1772+#
1773+# This file is part of GNU Libtool.
1774+#
1775+# GNU Libtool is free software; you can redistribute it and/or
1776+# modify it under the terms of the GNU General Public License as
1777+# published by the Free Software Foundation; either version 2 of
1778+# the License, or (at your option) any later version.
1779+#
1780+# As a special exception to the GNU General Public License,
1781+# if you distribute this file as part of a program or library that
1782+# is built using GNU Libtool, you may include this file under the
1783+# same distribution terms that you use for the rest of that program.
1784+#
1785+# GNU Libtool is distributed in the hope that it will be useful,
1786+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1787+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1788+# GNU General Public License for more details.
1789+#
1790+# You should have received a copy of the GNU General Public License
1791+# along with GNU Libtool; see the file COPYING. If not, a copy
1792+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
1793+# obtained by writing to the Free Software Foundation, Inc.,
1794+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1795+])
1796+
1797+# serial 56 LT_INIT
1798+
1799+
1800+# LT_PREREQ(VERSION)
1801+# ------------------
1802+# Complain and exit if this libtool version is less that VERSION.
1803+m4_defun([LT_PREREQ],
1804+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
1805+ [m4_default([$3],
1806+ [m4_fatal([Libtool version $1 or higher is required],
1807+ 63)])],
1808+ [$2])])
1809+
1810+
1811+# _LT_CHECK_BUILDDIR
1812+# ------------------
1813+# Complain if the absolute build directory name contains unusual characters
1814+m4_defun([_LT_CHECK_BUILDDIR],
1815+[case `pwd` in
1816+ *\ * | *\ *)
1817+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
1818+esac
1819+])
1820+
1821+
1822+# LT_INIT([OPTIONS])
1823+# ------------------
1824+AC_DEFUN([LT_INIT],
1825+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
1826+AC_BEFORE([$0], [LT_LANG])dnl
1827+AC_BEFORE([$0], [LT_OUTPUT])dnl
1828+AC_BEFORE([$0], [LTDL_INIT])dnl
1829+m4_require([_LT_CHECK_BUILDDIR])dnl
1830+
1831+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
1832+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
1833+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
1834+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
1835+dnl unless we require an AC_DEFUNed macro:
1836+AC_REQUIRE([LTOPTIONS_VERSION])dnl
1837+AC_REQUIRE([LTSUGAR_VERSION])dnl
1838+AC_REQUIRE([LTVERSION_VERSION])dnl
1839+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
1840+m4_require([_LT_PROG_LTMAIN])dnl
1841+
1842+dnl Parse OPTIONS
1843+_LT_SET_OPTIONS([$0], [$1])
1844
1845 # This can be used to rebuild libtool when needed
1846-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
1847+LIBTOOL_DEPS="$ltmain"
1848
1849 # Always use our own libtool.
1850 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
1851 AC_SUBST(LIBTOOL)dnl
1852
1853-# Prevent multiple expansion
1854-define([AC_PROG_LIBTOOL], [])
1855-])# _AC_PROG_LIBTOOL
1856-
1857-
1858-# AC_LIBTOOL_SETUP
1859-# ----------------
1860-AC_DEFUN([AC_LIBTOOL_SETUP],
1861-[AC_PREREQ(2.50)dnl
1862-AC_REQUIRE([AC_ENABLE_SHARED])dnl
1863-AC_REQUIRE([AC_ENABLE_STATIC])dnl
1864-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
1865-AC_REQUIRE([AC_CANONICAL_HOST])dnl
1866+_LT_SETUP
1867+
1868+# Only expand once:
1869+m4_define([LT_INIT])
1870+])# LT_INIT
1871+
1872+# Old names:
1873+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
1874+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
1875+dnl aclocal-1.4 backwards compatibility:
1876+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
1877+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
1878+
1879+
1880+# _LT_CC_BASENAME(CC)
1881+# -------------------
1882+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
1883+m4_defun([_LT_CC_BASENAME],
1884+[for cc_temp in $1""; do
1885+ case $cc_temp in
1886+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
1887+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
1888+ \-*) ;;
1889+ *) break;;
1890+ esac
1891+done
1892+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1893+])
1894+
1895+
1896+# _LT_FILEUTILS_DEFAULTS
1897+# ----------------------
1898+# It is okay to use these file commands and assume they have been set
1899+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
1900+m4_defun([_LT_FILEUTILS_DEFAULTS],
1901+[: ${CP="cp -f"}
1902+: ${MV="mv -f"}
1903+: ${RM="rm -f"}
1904+])# _LT_FILEUTILS_DEFAULTS
1905+
1906+
1907+# _LT_SETUP
1908+# ---------
1909+m4_defun([_LT_SETUP],
1910+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1911 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1912+_LT_DECL([], [host_alias], [0], [The host system])dnl
1913+_LT_DECL([], [host], [0])dnl
1914+_LT_DECL([], [host_os], [0])dnl
1915+dnl
1916+_LT_DECL([], [build_alias], [0], [The build system])dnl
1917+_LT_DECL([], [build], [0])dnl
1918+_LT_DECL([], [build_os], [0])dnl
1919+dnl
1920 AC_REQUIRE([AC_PROG_CC])dnl
1921-AC_REQUIRE([AC_PROG_LD])dnl
1922-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
1923-AC_REQUIRE([AC_PROG_NM])dnl
1924-
1925+AC_REQUIRE([LT_PATH_LD])dnl
1926+AC_REQUIRE([LT_PATH_NM])dnl
1927+dnl
1928 AC_REQUIRE([AC_PROG_LN_S])dnl
1929-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
1930-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
1931-AC_REQUIRE([AC_OBJEXT])dnl
1932-AC_REQUIRE([AC_EXEEXT])dnl
1933-dnl
1934-
1935-AC_LIBTOOL_SYS_MAX_CMD_LEN
1936-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
1937-AC_LIBTOOL_OBJDIR
1938-
1939-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1940-_LT_AC_PROG_ECHO_BACKSLASH
1941+test -z "$LN_S" && LN_S="ln -s"
1942+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
1943+dnl
1944+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
1945+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
1946+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
1947+dnl
1948+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1949+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
1950+m4_require([_LT_CMD_RELOAD])dnl
1951+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
1952+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
1953+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
1954+
1955+_LT_CONFIG_LIBTOOL_INIT([
1956+# See if we are running on zsh, and set the options which allow our
1957+# commands through without removal of \ escapes INIT.
1958+if test -n "\${ZSH_VERSION+set}" ; then
1959+ setopt NO_GLOB_SUBST
1960+fi
1961+])
1962+if test -n "${ZSH_VERSION+set}" ; then
1963+ setopt NO_GLOB_SUBST
1964+fi
1965+
1966+_LT_CHECK_OBJDIR
1967+
1968+m4_require([_LT_TAG_COMPILER])dnl
1969+_LT_PROG_ECHO_BACKSLASH
1970
1971 case $host_os in
1972 aix3*)
1973@@ -123,114 +216,653 @@
1974
1975 # Sed substitution that helps us do robust quoting. It backslashifies
1976 # metacharacters that are still active within double-quoted strings.
1977-Xsed='sed -e 1s/^X//'
1978-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
1979+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
1980
1981 # Same as above, but do not quote variable references.
1982-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
1983+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
1984
1985 # Sed substitution to delay expansion of an escaped shell variable in a
1986 # double_quote_subst'ed string.
1987 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1988
1989+# Sed substitution to delay expansion of an escaped single quote.
1990+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
1991+
1992 # Sed substitution to avoid accidental globbing in evaled expressions
1993 no_glob_subst='s/\*/\\\*/g'
1994
1995-# Constants:
1996-rm="rm -f"
1997-
1998 # Global variables:
1999-default_ofile=libtool
2000+ofile=libtool
2001 can_build_shared=yes
2002
2003 # All known linkers require a `.a' archive for static linking (except MSVC,
2004 # which needs '.lib').
2005 libext=a
2006-ltmain="$ac_aux_dir/ltmain.sh"
2007-ofile="$default_ofile"
2008+
2009 with_gnu_ld="$lt_cv_prog_gnu_ld"
2010
2011-AC_CHECK_TOOL(AR, ar, false)
2012-AC_CHECK_TOOL(RANLIB, ranlib, :)
2013-AC_CHECK_TOOL(STRIP, strip, :)
2014-
2015 old_CC="$CC"
2016 old_CFLAGS="$CFLAGS"
2017
2018 # Set sane defaults for various variables
2019-test -z "$AR" && AR=ar
2020-test -z "$AR_FLAGS" && AR_FLAGS=cru
2021-test -z "$AS" && AS=as
2022 test -z "$CC" && CC=cc
2023 test -z "$LTCC" && LTCC=$CC
2024 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
2025-test -z "$DLLTOOL" && DLLTOOL=dlltool
2026 test -z "$LD" && LD=ld
2027-test -z "$LN_S" && LN_S="ln -s"
2028-test -z "$MAGIC_CMD" && MAGIC_CMD=file
2029-test -z "$NM" && NM=nm
2030-test -z "$SED" && SED=sed
2031-test -z "$OBJDUMP" && OBJDUMP=objdump
2032-test -z "$RANLIB" && RANLIB=:
2033-test -z "$STRIP" && STRIP=:
2034 test -z "$ac_objext" && ac_objext=o
2035
2036-# Determine commands to create old-style static archives.
2037-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
2038-old_postinstall_cmds='chmod 644 $oldlib'
2039-old_postuninstall_cmds=
2040-
2041-if test -n "$RANLIB"; then
2042- case $host_os in
2043- openbsd*)
2044- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
2045- ;;
2046- *)
2047- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
2048- ;;
2049- esac
2050- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
2051-fi
2052-
2053 _LT_CC_BASENAME([$compiler])
2054
2055 # Only perform the check for file, if the check method requires it
2056+test -z "$MAGIC_CMD" && MAGIC_CMD=file
2057 case $deplibs_check_method in
2058 file_magic*)
2059 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
2060- AC_PATH_MAGIC
2061+ _LT_PATH_MAGIC
2062 fi
2063 ;;
2064 esac
2065
2066-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
2067-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
2068-enable_win32_dll=yes, enable_win32_dll=no)
2069-
2070-AC_ARG_ENABLE([libtool-lock],
2071- [AC_HELP_STRING([--disable-libtool-lock],
2072- [avoid locking (might break parallel builds)])])
2073-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2074-
2075-AC_ARG_WITH([pic],
2076- [AC_HELP_STRING([--with-pic],
2077- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
2078- [pic_mode="$withval"],
2079- [pic_mode=default])
2080-test -z "$pic_mode" && pic_mode=default
2081-
2082 # Use C for the default configuration in the libtool script
2083-tagname=
2084-AC_LIBTOOL_LANG_C_CONFIG
2085-_LT_AC_TAGCONFIG
2086-])# AC_LIBTOOL_SETUP
2087-
2088-
2089-# _LT_AC_SYS_COMPILER
2090+LT_SUPPORTED_TAG([CC])
2091+_LT_LANG_C_CONFIG
2092+_LT_LANG_DEFAULT_CONFIG
2093+_LT_CONFIG_COMMANDS
2094+])# _LT_SETUP
2095+
2096+
2097+# _LT_PROG_LTMAIN
2098+# ---------------
2099+# Note that this code is called both from `configure', and `config.status'
2100+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
2101+# `config.status' has no value for ac_aux_dir unless we are using Automake,
2102+# so we pass a copy along to make sure it has a sensible value anyway.
2103+m4_defun([_LT_PROG_LTMAIN],
2104+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
2105+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
2106+ltmain="$ac_aux_dir/ltmain.sh"
2107+])# _LT_PROG_LTMAIN
2108+
2109+
2110+
2111+# So that we can recreate a full libtool script including additional
2112+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
2113+# in macros and then make a single call at the end using the `libtool'
2114+# label.
2115+
2116+
2117+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
2118+# ----------------------------------------
2119+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
2120+m4_define([_LT_CONFIG_LIBTOOL_INIT],
2121+[m4_ifval([$1],
2122+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
2123+ [$1
2124+])])])
2125+
2126+# Initialize.
2127+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
2128+
2129+
2130+# _LT_CONFIG_LIBTOOL([COMMANDS])
2131+# ------------------------------
2132+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
2133+m4_define([_LT_CONFIG_LIBTOOL],
2134+[m4_ifval([$1],
2135+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
2136+ [$1
2137+])])])
2138+
2139+# Initialize.
2140+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
2141+
2142+
2143+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
2144+# -----------------------------------------------------
2145+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
2146+[_LT_CONFIG_LIBTOOL([$1])
2147+_LT_CONFIG_LIBTOOL_INIT([$2])
2148+])
2149+
2150+
2151+# _LT_FORMAT_COMMENT([COMMENT])
2152+# -----------------------------
2153+# Add leading comment marks to the start of each line, and a trailing
2154+# full-stop to the whole comment if one is not present already.
2155+m4_define([_LT_FORMAT_COMMENT],
2156+[m4_ifval([$1], [
2157+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
2158+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
2159+)])
2160+
2161+
2162+
2163+
2164+
2165+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
2166+# -------------------------------------------------------------------
2167+# CONFIGNAME is the name given to the value in the libtool script.
2168+# VARNAME is the (base) name used in the configure script.
2169+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
2170+# VARNAME. Any other value will be used directly.
2171+m4_define([_LT_DECL],
2172+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
2173+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
2174+ [m4_ifval([$1], [$1], [$2])])
2175+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
2176+ m4_ifval([$4],
2177+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
2178+ lt_dict_add_subkey([lt_decl_dict], [$2],
2179+ [tagged?], [m4_ifval([$5], [yes], [no])])])
2180+])
2181+
2182+
2183+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
2184+# --------------------------------------------------------
2185+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
2186+
2187+
2188+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
2189+# ------------------------------------------------
2190+m4_define([lt_decl_tag_varnames],
2191+[_lt_decl_filter([tagged?], [yes], $@)])
2192+
2193+
2194+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
2195+# ---------------------------------------------------------
2196+m4_define([_lt_decl_filter],
2197+[m4_case([$#],
2198+ [0], [m4_fatal([$0: too few arguments: $#])],
2199+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
2200+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
2201+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
2202+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
2203+])
2204+
2205+
2206+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
2207+# --------------------------------------------------
2208+m4_define([lt_decl_quote_varnames],
2209+[_lt_decl_filter([value], [1], $@)])
2210+
2211+
2212+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
2213+# ---------------------------------------------------
2214+m4_define([lt_decl_dquote_varnames],
2215+[_lt_decl_filter([value], [2], $@)])
2216+
2217+
2218+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
2219+# ---------------------------------------------------
2220+m4_define([lt_decl_varnames_tagged],
2221+[m4_assert([$# <= 2])dnl
2222+_$0(m4_quote(m4_default([$1], [[, ]])),
2223+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
2224+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
2225+m4_define([_lt_decl_varnames_tagged],
2226+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
2227+
2228+
2229+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
2230+# ------------------------------------------------
2231+m4_define([lt_decl_all_varnames],
2232+[_$0(m4_quote(m4_default([$1], [[, ]])),
2233+ m4_if([$2], [],
2234+ m4_quote(lt_decl_varnames),
2235+ m4_quote(m4_shift($@))))[]dnl
2236+])
2237+m4_define([_lt_decl_all_varnames],
2238+[lt_join($@, lt_decl_varnames_tagged([$1],
2239+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
2240+])
2241+
2242+
2243+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
2244+# ------------------------------------
2245+# Quote a variable value, and forward it to `config.status' so that its
2246+# declaration there will have the same value as in `configure'. VARNAME
2247+# must have a single quote delimited value for this to work.
2248+m4_define([_LT_CONFIG_STATUS_DECLARE],
2249+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
2250+
2251+
2252+# _LT_CONFIG_STATUS_DECLARATIONS
2253+# ------------------------------
2254+# We delimit libtool config variables with single quotes, so when
2255+# we write them to config.status, we have to be sure to quote all
2256+# embedded single quotes properly. In configure, this macro expands
2257+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
2258+#
2259+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
2260+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
2261+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
2262+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
2263+
2264+
2265+# _LT_LIBTOOL_TAGS
2266+# ----------------
2267+# Output comment and list of tags supported by the script
2268+m4_defun([_LT_LIBTOOL_TAGS],
2269+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
2270+available_tags="_LT_TAGS"dnl
2271+])
2272+
2273+
2274+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
2275+# -----------------------------------
2276+# Extract the dictionary values for VARNAME (optionally with TAG) and
2277+# expand to a commented shell variable setting:
2278+#
2279+# # Some comment about what VAR is for.
2280+# visible_name=$lt_internal_name
2281+m4_define([_LT_LIBTOOL_DECLARE],
2282+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
2283+ [description])))[]dnl
2284+m4_pushdef([_libtool_name],
2285+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
2286+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
2287+ [0], [_libtool_name=[$]$1],
2288+ [1], [_libtool_name=$lt_[]$1],
2289+ [2], [_libtool_name=$lt_[]$1],
2290+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
2291+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
2292+])
2293+
2294+
2295+# _LT_LIBTOOL_CONFIG_VARS
2296+# -----------------------
2297+# Produce commented declarations of non-tagged libtool config variables
2298+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
2299+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
2300+# section) are produced by _LT_LIBTOOL_TAG_VARS.
2301+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
2302+[m4_foreach([_lt_var],
2303+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
2304+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
2305+
2306+
2307+# _LT_LIBTOOL_TAG_VARS(TAG)
2308+# -------------------------
2309+m4_define([_LT_LIBTOOL_TAG_VARS],
2310+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
2311+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
2312+
2313+
2314+# _LT_TAGVAR(VARNAME, [TAGNAME])
2315+# ------------------------------
2316+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
2317+
2318+
2319+# _LT_CONFIG_COMMANDS
2320 # -------------------
2321-AC_DEFUN([_LT_AC_SYS_COMPILER],
2322+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
2323+# variables for single and double quote escaping we saved from calls
2324+# to _LT_DECL, we can put quote escaped variables declarations
2325+# into `config.status', and then the shell code to quote escape them in
2326+# for loops in `config.status'. Finally, any additional code accumulated
2327+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
2328+m4_defun([_LT_CONFIG_COMMANDS],
2329+[AC_PROVIDE_IFELSE([LT_OUTPUT],
2330+ dnl If the libtool generation code has been placed in $CONFIG_LT,
2331+ dnl instead of duplicating it all over again into config.status,
2332+ dnl then we will have config.status run $CONFIG_LT later, so it
2333+ dnl needs to know what name is stored there:
2334+ [AC_CONFIG_COMMANDS([libtool],
2335+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
2336+ dnl If the libtool generation code is destined for config.status,
2337+ dnl expand the accumulated commands and init code now:
2338+ [AC_CONFIG_COMMANDS([libtool],
2339+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
2340+])#_LT_CONFIG_COMMANDS
2341+
2342+
2343+# Initialize.
2344+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
2345+[
2346+
2347+# The HP-UX ksh and POSIX shell print the target directory to stdout
2348+# if CDPATH is set.
2349+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2350+
2351+sed_quote_subst='$sed_quote_subst'
2352+double_quote_subst='$double_quote_subst'
2353+delay_variable_subst='$delay_variable_subst'
2354+_LT_CONFIG_STATUS_DECLARATIONS
2355+LTCC='$LTCC'
2356+LTCFLAGS='$LTCFLAGS'
2357+compiler='$compiler_DEFAULT'
2358+
2359+# Quote evaled strings.
2360+for var in lt_decl_all_varnames([[ \
2361+]], lt_decl_quote_varnames); do
2362+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
2363+ *[[\\\\\\\`\\"\\\$]]*)
2364+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
2365+ ;;
2366+ *)
2367+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
2368+ ;;
2369+ esac
2370+done
2371+
2372+# Double-quote double-evaled strings.
2373+for var in lt_decl_all_varnames([[ \
2374+]], lt_decl_dquote_varnames); do
2375+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
2376+ *[[\\\\\\\`\\"\\\$]]*)
2377+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
2378+ ;;
2379+ *)
2380+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
2381+ ;;
2382+ esac
2383+done
2384+
2385+# Fix-up fallback echo if it was mangled by the above quoting rules.
2386+case \$lt_ECHO in
2387+*'\\\[$]0 --fallback-echo"')dnl "
2388+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
2389+ ;;
2390+esac
2391+
2392+_LT_OUTPUT_LIBTOOL_INIT
2393+])
2394+
2395+
2396+# LT_OUTPUT
2397+# ---------
2398+# This macro allows early generation of the libtool script (before
2399+# AC_OUTPUT is called), incase it is used in configure for compilation
2400+# tests.
2401+AC_DEFUN([LT_OUTPUT],
2402+[: ${CONFIG_LT=./config.lt}
2403+AC_MSG_NOTICE([creating $CONFIG_LT])
2404+cat >"$CONFIG_LT" <<_LTEOF
2405+#! $SHELL
2406+# Generated by $as_me.
2407+# Run this file to recreate a libtool stub with the current configuration.
2408+
2409+lt_cl_silent=false
2410+SHELL=\${CONFIG_SHELL-$SHELL}
2411+_LTEOF
2412+
2413+cat >>"$CONFIG_LT" <<\_LTEOF
2414+AS_SHELL_SANITIZE
2415+_AS_PREPARE
2416+
2417+exec AS_MESSAGE_FD>&1
2418+exec AS_MESSAGE_LOG_FD>>config.log
2419+{
2420+ echo
2421+ AS_BOX([Running $as_me.])
2422+} >&AS_MESSAGE_LOG_FD
2423+
2424+lt_cl_help="\
2425+\`$as_me' creates a local libtool stub from the current configuration,
2426+for use in further configure time tests before the real libtool is
2427+generated.
2428+
2429+Usage: $[0] [[OPTIONS]]
2430+
2431+ -h, --help print this help, then exit
2432+ -V, --version print version number, then exit
2433+ -q, --quiet do not print progress messages
2434+ -d, --debug don't remove temporary files
2435+
2436+Report bugs to <bug-libtool@gnu.org>."
2437+
2438+lt_cl_version="\
2439+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
2440+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
2441+configured by $[0], generated by m4_PACKAGE_STRING.
2442+
2443+Copyright (C) 2008 Free Software Foundation, Inc.
2444+This config.lt script is free software; the Free Software Foundation
2445+gives unlimited permision to copy, distribute and modify it."
2446+
2447+while test $[#] != 0
2448+do
2449+ case $[1] in
2450+ --version | --v* | -V )
2451+ echo "$lt_cl_version"; exit 0 ;;
2452+ --help | --h* | -h )
2453+ echo "$lt_cl_help"; exit 0 ;;
2454+ --debug | --d* | -d )
2455+ debug=: ;;
2456+ --quiet | --q* | --silent | --s* | -q )
2457+ lt_cl_silent=: ;;
2458+
2459+ -*) AC_MSG_ERROR([unrecognized option: $[1]
2460+Try \`$[0] --help' for more information.]) ;;
2461+
2462+ *) AC_MSG_ERROR([unrecognized argument: $[1]
2463+Try \`$[0] --help' for more information.]) ;;
2464+ esac
2465+ shift
2466+done
2467+
2468+if $lt_cl_silent; then
2469+ exec AS_MESSAGE_FD>/dev/null
2470+fi
2471+_LTEOF
2472+
2473+cat >>"$CONFIG_LT" <<_LTEOF
2474+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
2475+_LTEOF
2476+
2477+cat >>"$CONFIG_LT" <<\_LTEOF
2478+AC_MSG_NOTICE([creating $ofile])
2479+_LT_OUTPUT_LIBTOOL_COMMANDS
2480+AS_EXIT(0)
2481+_LTEOF
2482+chmod +x "$CONFIG_LT"
2483+
2484+# configure is writing to config.log, but config.lt does its own redirection,
2485+# appending to config.log, which fails on DOS, as config.log is still kept
2486+# open by configure. Here we exec the FD to /dev/null, effectively closing
2487+# config.log, so it can be properly (re)opened and appended to by config.lt.
2488+if test "$no_create" != yes; then
2489+ lt_cl_success=:
2490+ test "$silent" = yes &&
2491+ lt_config_lt_args="$lt_config_lt_args --quiet"
2492+ exec AS_MESSAGE_LOG_FD>/dev/null
2493+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
2494+ exec AS_MESSAGE_LOG_FD>>config.log
2495+ $lt_cl_success || AS_EXIT(1)
2496+fi
2497+])# LT_OUTPUT
2498+
2499+
2500+# _LT_CONFIG(TAG)
2501+# ---------------
2502+# If TAG is the built-in tag, create an initial libtool script with a
2503+# default configuration from the untagged config vars. Otherwise add code
2504+# to config.status for appending the configuration named by TAG from the
2505+# matching tagged config vars.
2506+m4_defun([_LT_CONFIG],
2507+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2508+_LT_CONFIG_SAVE_COMMANDS([
2509+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
2510+ m4_if(_LT_TAG, [C], [
2511+ # See if we are running on zsh, and set the options which allow our
2512+ # commands through without removal of \ escapes.
2513+ if test -n "${ZSH_VERSION+set}" ; then
2514+ setopt NO_GLOB_SUBST
2515+ fi
2516+
2517+ cfgfile="${ofile}T"
2518+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
2519+ $RM "$cfgfile"
2520+
2521+ cat <<_LT_EOF >> "$cfgfile"
2522+#! $SHELL
2523+
2524+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
2525+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
2526+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
2527+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
2528+#
2529+_LT_COPYING
2530+_LT_LIBTOOL_TAGS
2531+
2532+# ### BEGIN LIBTOOL CONFIG
2533+_LT_LIBTOOL_CONFIG_VARS
2534+_LT_LIBTOOL_TAG_VARS
2535+# ### END LIBTOOL CONFIG
2536+
2537+_LT_EOF
2538+
2539+ case $host_os in
2540+ aix3*)
2541+ cat <<\_LT_EOF >> "$cfgfile"
2542+# AIX sometimes has problems with the GCC collect2 program. For some
2543+# reason, if we set the COLLECT_NAMES environment variable, the problems
2544+# vanish in a puff of smoke.
2545+if test "X${COLLECT_NAMES+set}" != Xset; then
2546+ COLLECT_NAMES=
2547+ export COLLECT_NAMES
2548+fi
2549+_LT_EOF
2550+ ;;
2551+ esac
2552+
2553+ _LT_PROG_LTMAIN
2554+
2555+ # We use sed instead of cat because bash on DJGPP gets confused if
2556+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
2557+ # text mode, it properly converts lines to CR/LF. This bash problem
2558+ # is reportedly fixed, but why not run on old versions too?
2559+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
2560+ || (rm -f "$cfgfile"; exit 1)
2561+
2562+ _LT_PROG_XSI_SHELLFNS
2563+
2564+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
2565+ || (rm -f "$cfgfile"; exit 1)
2566+
2567+ mv -f "$cfgfile" "$ofile" ||
2568+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
2569+ chmod +x "$ofile"
2570+],
2571+[cat <<_LT_EOF >> "$ofile"
2572+
2573+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
2574+dnl in a comment (ie after a #).
2575+# ### BEGIN LIBTOOL TAG CONFIG: $1
2576+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
2577+# ### END LIBTOOL TAG CONFIG: $1
2578+_LT_EOF
2579+])dnl /m4_if
2580+],
2581+[m4_if([$1], [], [
2582+ PACKAGE='$PACKAGE'
2583+ VERSION='$VERSION'
2584+ TIMESTAMP='$TIMESTAMP'
2585+ RM='$RM'
2586+ ofile='$ofile'], [])
2587+])dnl /_LT_CONFIG_SAVE_COMMANDS
2588+])# _LT_CONFIG
2589+
2590+
2591+# LT_SUPPORTED_TAG(TAG)
2592+# ---------------------
2593+# Trace this macro to discover what tags are supported by the libtool
2594+# --tag option, using:
2595+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
2596+AC_DEFUN([LT_SUPPORTED_TAG], [])
2597+
2598+
2599+# C support is built-in for now
2600+m4_define([_LT_LANG_C_enabled], [])
2601+m4_define([_LT_TAGS], [])
2602+
2603+
2604+# LT_LANG(LANG)
2605+# -------------
2606+# Enable libtool support for the given language if not already enabled.
2607+AC_DEFUN([LT_LANG],
2608+[AC_BEFORE([$0], [LT_OUTPUT])dnl
2609+m4_case([$1],
2610+ [C], [_LT_LANG(C)],
2611+ [C++], [_LT_LANG(CXX)],
2612+ [Java], [_LT_LANG(GCJ)],
2613+ [Fortran 77], [_LT_LANG(F77)],
2614+ [Fortran], [_LT_LANG(FC)],
2615+ [Windows Resource], [_LT_LANG(RC)],
2616+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
2617+ [_LT_LANG($1)],
2618+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
2619+])# LT_LANG
2620+
2621+
2622+# _LT_LANG(LANGNAME)
2623+# ------------------
2624+m4_defun([_LT_LANG],
2625+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
2626+ [LT_SUPPORTED_TAG([$1])dnl
2627+ m4_append([_LT_TAGS], [$1 ])dnl
2628+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
2629+ _LT_LANG_$1_CONFIG($1)])dnl
2630+])# _LT_LANG
2631+
2632+
2633+# _LT_LANG_DEFAULT_CONFIG
2634+# -----------------------
2635+m4_defun([_LT_LANG_DEFAULT_CONFIG],
2636+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
2637+ [LT_LANG(CXX)],
2638+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
2639+
2640+AC_PROVIDE_IFELSE([AC_PROG_F77],
2641+ [LT_LANG(F77)],
2642+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
2643+
2644+AC_PROVIDE_IFELSE([AC_PROG_FC],
2645+ [LT_LANG(FC)],
2646+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
2647+
2648+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
2649+dnl pulling things in needlessly.
2650+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
2651+ [LT_LANG(GCJ)],
2652+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
2653+ [LT_LANG(GCJ)],
2654+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
2655+ [LT_LANG(GCJ)],
2656+ [m4_ifdef([AC_PROG_GCJ],
2657+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
2658+ m4_ifdef([A][M_PROG_GCJ],
2659+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
2660+ m4_ifdef([LT_PROG_GCJ],
2661+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
2662+
2663+AC_PROVIDE_IFELSE([LT_PROG_RC],
2664+ [LT_LANG(RC)],
2665+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
2666+])# _LT_LANG_DEFAULT_CONFIG
2667+
2668+# Obsolete macros:
2669+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
2670+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
2671+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
2672+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
2673+dnl aclocal-1.4 backwards compatibility:
2674+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
2675+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
2676+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
2677+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
2678+
2679+
2680+# _LT_TAG_COMPILER
2681+# ----------------
2682+m4_defun([_LT_TAG_COMPILER],
2683 [AC_REQUIRE([AC_PROG_CC])dnl
2684
2685+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
2686+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
2687+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
2688+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
2689+
2690 # If no C compiler was specified, use CC.
2691 LTCC=${LTCC-"$CC"}
2692
2693@@ -239,36 +871,20 @@
2694
2695 # Allow CC to be a program name with arguments.
2696 compiler=$CC
2697-])# _LT_AC_SYS_COMPILER
2698-
2699-
2700-# _LT_CC_BASENAME(CC)
2701-# -------------------
2702-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
2703-AC_DEFUN([_LT_CC_BASENAME],
2704-[for cc_temp in $1""; do
2705- case $cc_temp in
2706- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
2707- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
2708- \-*) ;;
2709- *) break;;
2710- esac
2711-done
2712-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
2713-])
2714+])# _LT_TAG_COMPILER
2715
2716
2717 # _LT_COMPILER_BOILERPLATE
2718 # ------------------------
2719 # Check for compiler boilerplate output or warnings with
2720 # the simple compiler test code.
2721-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
2722-[AC_REQUIRE([LT_AC_PROG_SED])dnl
2723+m4_defun([_LT_COMPILER_BOILERPLATE],
2724+[m4_require([_LT_DECL_SED])dnl
2725 ac_outfile=conftest.$ac_objext
2726 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
2727 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2728 _lt_compiler_boilerplate=`cat conftest.err`
2729-$rm conftest*
2730+$RM conftest*
2731 ])# _LT_COMPILER_BOILERPLATE
2732
2733
2734@@ -276,26 +892,150 @@
2735 # ----------------------
2736 # Check for linker boilerplate output or warnings with
2737 # the simple link test code.
2738-AC_DEFUN([_LT_LINKER_BOILERPLATE],
2739-[AC_REQUIRE([LT_AC_PROG_SED])dnl
2740+m4_defun([_LT_LINKER_BOILERPLATE],
2741+[m4_require([_LT_DECL_SED])dnl
2742 ac_outfile=conftest.$ac_objext
2743 echo "$lt_simple_link_test_code" >conftest.$ac_ext
2744 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2745 _lt_linker_boilerplate=`cat conftest.err`
2746-$rm conftest*
2747+$RM -r conftest*
2748 ])# _LT_LINKER_BOILERPLATE
2749
2750-
2751-# _LT_AC_SYS_LIBPATH_AIX
2752-# ----------------------
2753+# _LT_REQUIRED_DARWIN_CHECKS
2754+# -------------------------
2755+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
2756+ case $host_os in
2757+ rhapsody* | darwin*)
2758+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
2759+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
2760+ AC_CHECK_TOOL([LIPO], [lipo], [:])
2761+ AC_CHECK_TOOL([OTOOL], [otool], [:])
2762+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
2763+ _LT_DECL([], [DSYMUTIL], [1],
2764+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
2765+ _LT_DECL([], [NMEDIT], [1],
2766+ [Tool to change global to local symbols on Mac OS X])
2767+ _LT_DECL([], [LIPO], [1],
2768+ [Tool to manipulate fat objects and archives on Mac OS X])
2769+ _LT_DECL([], [OTOOL], [1],
2770+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
2771+ _LT_DECL([], [OTOOL64], [1],
2772+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
2773+
2774+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
2775+ [lt_cv_apple_cc_single_mod=no
2776+ if test -z "${LT_MULTI_MODULE}"; then
2777+ # By default we will add the -single_module flag. You can override
2778+ # by either setting the environment variable LT_MULTI_MODULE
2779+ # non-empty at configure time, or by adding -multi_module to the
2780+ # link flags.
2781+ rm -rf libconftest.dylib*
2782+ echo "int foo(void){return 1;}" > conftest.c
2783+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
2784+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
2785+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
2786+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
2787+ _lt_result=$?
2788+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
2789+ lt_cv_apple_cc_single_mod=yes
2790+ else
2791+ cat conftest.err >&AS_MESSAGE_LOG_FD
2792+ fi
2793+ rm -rf libconftest.dylib*
2794+ rm -f conftest.*
2795+ fi])
2796+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
2797+ [lt_cv_ld_exported_symbols_list],
2798+ [lt_cv_ld_exported_symbols_list=no
2799+ save_LDFLAGS=$LDFLAGS
2800+ echo "_main" > conftest.sym
2801+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
2802+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2803+ [lt_cv_ld_exported_symbols_list=yes],
2804+ [lt_cv_ld_exported_symbols_list=no])
2805+ LDFLAGS="$save_LDFLAGS"
2806+ ])
2807+ case $host_os in
2808+ rhapsody* | darwin1.[[012]])
2809+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
2810+ darwin1.*)
2811+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
2812+ darwin*) # darwin 5.x on
2813+ # if running on 10.5 or later, the deployment target defaults
2814+ # to the OS version, if on x86, and 10.4, the deployment
2815+ # target defaults to 10.4. Don't you love it?
2816+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
2817+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
2818+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
2819+ 10.[[012]]*)
2820+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
2821+ 10.*)
2822+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
2823+ esac
2824+ ;;
2825+ esac
2826+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
2827+ _lt_dar_single_mod='$single_module'
2828+ fi
2829+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
2830+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
2831+ else
2832+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
2833+ fi
2834+ if test "$DSYMUTIL" != ":"; then
2835+ _lt_dsymutil='~$DSYMUTIL $lib || :'
2836+ else
2837+ _lt_dsymutil=
2838+ fi
2839+ ;;
2840+ esac
2841+])
2842+
2843+
2844+# _LT_DARWIN_LINKER_FEATURES
2845+# --------------------------
2846+# Checks for linker and compiler features on darwin
2847+m4_defun([_LT_DARWIN_LINKER_FEATURES],
2848+[
2849+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
2850+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2851+ _LT_TAGVAR(hardcode_direct, $1)=no
2852+ _LT_TAGVAR(hardcode_automatic, $1)=yes
2853+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2854+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
2855+ _LT_TAGVAR(link_all_deplibs, $1)=yes
2856+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
2857+ case $cc_basename in
2858+ ifort*) _lt_dar_can_shared=yes ;;
2859+ *) _lt_dar_can_shared=$GCC ;;
2860+ esac
2861+ if test "$_lt_dar_can_shared" = "yes"; then
2862+ output_verbose_link_cmd=echo
2863+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
2864+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
2865+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
2866+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
2867+ m4_if([$1], [CXX],
2868+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
2869+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
2870+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
2871+ fi
2872+],[])
2873+ else
2874+ _LT_TAGVAR(ld_shlibs, $1)=no
2875+ fi
2876+])
2877+
2878+# _LT_SYS_MODULE_PATH_AIX
2879+# -----------------------
2880 # Links a minimal program and checks the executable
2881 # for the system default hardcoded library path. In most cases,
2882 # this is /usr/lib:/lib, but when the MPI compilers are used
2883 # the location of the communication and MPI libs are included too.
2884 # If we don't find anything, use the default library path according
2885 # to the aix ld manual.
2886-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
2887-[AC_REQUIRE([LT_AC_PROG_SED])dnl
2888+m4_defun([_LT_SYS_MODULE_PATH_AIX],
2889+[m4_require([_LT_DECL_SED])dnl
2890 AC_LINK_IFELSE(AC_LANG_PROGRAM,[
2891 lt_aix_libpath_sed='
2892 /Import File Strings/,/^$/ {
2893@@ -310,45 +1050,45 @@
2894 aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
2895 fi],[])
2896 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
2897-])# _LT_AC_SYS_LIBPATH_AIX
2898-
2899-
2900-# _LT_AC_SHELL_INIT(ARG)
2901-# ----------------------
2902-AC_DEFUN([_LT_AC_SHELL_INIT],
2903+])# _LT_SYS_MODULE_PATH_AIX
2904+
2905+
2906+# _LT_SHELL_INIT(ARG)
2907+# -------------------
2908+m4_define([_LT_SHELL_INIT],
2909 [ifdef([AC_DIVERSION_NOTICE],
2910 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
2911 [AC_DIVERT_PUSH(NOTICE)])
2912 $1
2913 AC_DIVERT_POP
2914-])# _LT_AC_SHELL_INIT
2915-
2916-
2917-# _LT_AC_PROG_ECHO_BACKSLASH
2918-# --------------------------
2919+])# _LT_SHELL_INIT
2920+
2921+
2922+# _LT_PROG_ECHO_BACKSLASH
2923+# -----------------------
2924 # Add some code to the start of the generated configure script which
2925 # will find an echo command which doesn't interpret backslashes.
2926-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
2927-[_LT_AC_SHELL_INIT([
2928+m4_defun([_LT_PROG_ECHO_BACKSLASH],
2929+[_LT_SHELL_INIT([
2930 # Check that we are running under the correct shell.
2931 SHELL=${CONFIG_SHELL-/bin/sh}
2932
2933-case X$ECHO in
2934+case X$lt_ECHO in
2935 X*--fallback-echo)
2936 # Remove one level of quotation (which was required for Make).
2937- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2938+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2939 ;;
2940 esac
2941
2942-echo=${ECHO-echo}
2943+ECHO=${lt_ECHO-echo}
2944 if test "X[$]1" = X--no-reexec; then
2945 # Discard the --no-reexec flag, and continue.
2946 shift
2947 elif test "X[$]1" = X--fallback-echo; then
2948 # Avoid inline document here, it may be left over
2949 :
2950-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2951- # Yippee, $echo works!
2952+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
2953+ # Yippee, $ECHO works!
2954 :
2955 else
2956 # Restart under the correct shell.
2957@@ -358,9 +1098,9 @@
2958 if test "X[$]1" = X--fallback-echo; then
2959 # used as fallback echo
2960 shift
2961- cat <<EOF
2962+ cat <<_LT_EOF
2963 [$]*
2964-EOF
2965+_LT_EOF
2966 exit 0
2967 fi
2968
2969@@ -368,124 +1108,127 @@
2970 # if CDPATH is set.
2971 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2972
2973-if test -z "$ECHO"; then
2974-if test "X${echo_test_string+set}" != Xset; then
2975-# find a string as large as possible, as long as the shell can cope with it
2976- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2977- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2978- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2979- echo_test_string=`eval $cmd` &&
2980- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2981- then
2982- break
2983- fi
2984- done
2985-fi
2986-
2987-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2988- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2989- test "X$echo_testing_string" = "X$echo_test_string"; then
2990- :
2991-else
2992- # The Solaris, AIX, and Digital Unix default echo programs unquote
2993- # backslashes. This makes it impossible to quote backslashes using
2994- # echo "$something" | sed 's/\\/\\\\/g'
2995- #
2996- # So, first we look for a working echo in the user's PATH.
2997-
2998- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2999- for dir in $PATH /usr/ucb; do
3000+if test -z "$lt_ECHO"; then
3001+ if test "X${echo_test_string+set}" != Xset; then
3002+ # find a string as large as possible, as long as the shell can cope with it
3003+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
3004+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
3005+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
3006+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
3007+ then
3008+ break
3009+ fi
3010+ done
3011+ fi
3012+
3013+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
3014+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
3015+ test "X$echo_testing_string" = "X$echo_test_string"; then
3016+ :
3017+ else
3018+ # The Solaris, AIX, and Digital Unix default echo programs unquote
3019+ # backslashes. This makes it impossible to quote backslashes using
3020+ # echo "$something" | sed 's/\\/\\\\/g'
3021+ #
3022+ # So, first we look for a working echo in the user's PATH.
3023+
3024+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3025+ for dir in $PATH /usr/ucb; do
3026+ IFS="$lt_save_ifs"
3027+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3028+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3029+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3030+ test "X$echo_testing_string" = "X$echo_test_string"; then
3031+ ECHO="$dir/echo"
3032+ break
3033+ fi
3034+ done
3035 IFS="$lt_save_ifs"
3036- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3037- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3038- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3039- test "X$echo_testing_string" = "X$echo_test_string"; then
3040- echo="$dir/echo"
3041- break
3042- fi
3043- done
3044- IFS="$lt_save_ifs"
3045
3046- if test "X$echo" = Xecho; then
3047- # We didn't find a better echo, so look for alternatives.
3048- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
3049- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
3050- test "X$echo_testing_string" = "X$echo_test_string"; then
3051- # This shell has a builtin print -r that does the trick.
3052- echo='print -r'
3053- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
3054- test "X$CONFIG_SHELL" != X/bin/ksh; then
3055- # If we have ksh, try running configure again with it.
3056- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3057- export ORIGINAL_CONFIG_SHELL
3058- CONFIG_SHELL=/bin/ksh
3059- export CONFIG_SHELL
3060- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
3061- else
3062- # Try using printf.
3063- echo='printf %s\n'
3064- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3065- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3066- test "X$echo_testing_string" = "X$echo_test_string"; then
3067- # Cool, printf works
3068- :
3069- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3070- test "X$echo_testing_string" = 'X\t' &&
3071- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3072- test "X$echo_testing_string" = "X$echo_test_string"; then
3073- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
3074- export CONFIG_SHELL
3075- SHELL="$CONFIG_SHELL"
3076- export SHELL
3077- echo="$CONFIG_SHELL [$]0 --fallback-echo"
3078- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3079- test "X$echo_testing_string" = 'X\t' &&
3080- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3081- test "X$echo_testing_string" = "X$echo_test_string"; then
3082- echo="$CONFIG_SHELL [$]0 --fallback-echo"
3083+ if test "X$ECHO" = Xecho; then
3084+ # We didn't find a better echo, so look for alternatives.
3085+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
3086+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
3087+ test "X$echo_testing_string" = "X$echo_test_string"; then
3088+ # This shell has a builtin print -r that does the trick.
3089+ ECHO='print -r'
3090+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
3091+ test "X$CONFIG_SHELL" != X/bin/ksh; then
3092+ # If we have ksh, try running configure again with it.
3093+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3094+ export ORIGINAL_CONFIG_SHELL
3095+ CONFIG_SHELL=/bin/ksh
3096+ export CONFIG_SHELL
3097+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
3098 else
3099- # maybe with a smaller string...
3100- prev=:
3101-
3102- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
3103- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
3104- then
3105- break
3106+ # Try using printf.
3107+ ECHO='printf %s\n'
3108+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
3109+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
3110+ test "X$echo_testing_string" = "X$echo_test_string"; then
3111+ # Cool, printf works
3112+ :
3113+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3114+ test "X$echo_testing_string" = 'X\t' &&
3115+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3116+ test "X$echo_testing_string" = "X$echo_test_string"; then
3117+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
3118+ export CONFIG_SHELL
3119+ SHELL="$CONFIG_SHELL"
3120+ export SHELL
3121+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
3122+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3123+ test "X$echo_testing_string" = 'X\t' &&
3124+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3125+ test "X$echo_testing_string" = "X$echo_test_string"; then
3126+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
3127+ else
3128+ # maybe with a smaller string...
3129+ prev=:
3130+
3131+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
3132+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
3133+ then
3134+ break
3135+ fi
3136+ prev="$cmd"
3137+ done
3138+
3139+ if test "$prev" != 'sed 50q "[$]0"'; then
3140+ echo_test_string=`eval $prev`
3141+ export echo_test_string
3142+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
3143+ else
3144+ # Oops. We lost completely, so just stick with echo.
3145+ ECHO=echo
3146 fi
3147- prev="$cmd"
3148- done
3149-
3150- if test "$prev" != 'sed 50q "[$]0"'; then
3151- echo_test_string=`eval $prev`
3152- export echo_test_string
3153- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
3154- else
3155- # Oops. We lost completely, so just stick with echo.
3156- echo=echo
3157- fi
3158+ fi
3159 fi
3160 fi
3161 fi
3162 fi
3163-fi
3164
3165 # Copy echo and quote the copy suitably for passing to libtool from
3166 # the Makefile, instead of quoting the original, which is used later.
3167-ECHO=$echo
3168-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
3169- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
3170+lt_ECHO=$ECHO
3171+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
3172+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
3173 fi
3174
3175-AC_SUBST(ECHO)
3176-])])# _LT_AC_PROG_ECHO_BACKSLASH
3177-
3178-
3179-# _LT_AC_LOCK
3180-# -----------
3181-AC_DEFUN([_LT_AC_LOCK],
3182+AC_SUBST(lt_ECHO)
3183+])
3184+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
3185+_LT_DECL([], [ECHO], [1],
3186+ [An echo program that does not interpret backslashes])
3187+])# _LT_PROG_ECHO_BACKSLASH
3188+
3189+
3190+# _LT_ENABLE_LOCK
3191+# ---------------
3192+m4_defun([_LT_ENABLE_LOCK],
3193 [AC_ARG_ENABLE([libtool-lock],
3194- [AC_HELP_STRING([--disable-libtool-lock],
3195- [avoid locking (might break parallel builds)])])
3196+ [AS_HELP_STRING([--disable-libtool-lock],
3197+ [avoid locking (might break parallel builds)])])
3198 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
3199
3200 # Some flags need to be propagated to the compiler or linker for good
3201@@ -496,12 +1239,12 @@
3202 echo 'int i;' > conftest.$ac_ext
3203 if AC_TRY_EVAL(ac_compile); then
3204 case `/usr/bin/file conftest.$ac_objext` in
3205- *ELF-32*)
3206- HPUX_IA64_MODE="32"
3207- ;;
3208- *ELF-64*)
3209- HPUX_IA64_MODE="64"
3210- ;;
3211+ *ELF-32*)
3212+ HPUX_IA64_MODE="32"
3213+ ;;
3214+ *ELF-64*)
3215+ HPUX_IA64_MODE="64"
3216+ ;;
3217 esac
3218 fi
3219 rm -rf conftest*
3220@@ -510,79 +1253,79 @@
3221 # Find out which ABI we are using.
3222 echo '[#]line __oline__ "configure"' > conftest.$ac_ext
3223 if AC_TRY_EVAL(ac_compile); then
3224- if test "$lt_cv_prog_gnu_ld" = yes; then
3225- case `/usr/bin/file conftest.$ac_objext` in
3226- *32-bit*)
3227- LD="${LD-ld} -melf32bsmip"
3228- ;;
3229- *N32*)
3230- LD="${LD-ld} -melf32bmipn32"
3231- ;;
3232- *64-bit*)
3233- LD="${LD-ld} -melf64bmip"
3234- ;;
3235- esac
3236- else
3237- case `/usr/bin/file conftest.$ac_objext` in
3238- *32-bit*)
3239- LD="${LD-ld} -32"
3240- ;;
3241- *N32*)
3242- LD="${LD-ld} -n32"
3243- ;;
3244- *64-bit*)
3245- LD="${LD-ld} -64"
3246- ;;
3247- esac
3248- fi
3249+ if test "$lt_cv_prog_gnu_ld" = yes; then
3250+ case `/usr/bin/file conftest.$ac_objext` in
3251+ *32-bit*)
3252+ LD="${LD-ld} -melf32bsmip"
3253+ ;;
3254+ *N32*)
3255+ LD="${LD-ld} -melf32bmipn32"
3256+ ;;
3257+ *64-bit*)
3258+ LD="${LD-ld} -melf64bmip"
3259+ ;;
3260+ esac
3261+ else
3262+ case `/usr/bin/file conftest.$ac_objext` in
3263+ *32-bit*)
3264+ LD="${LD-ld} -32"
3265+ ;;
3266+ *N32*)
3267+ LD="${LD-ld} -n32"
3268+ ;;
3269+ *64-bit*)
3270+ LD="${LD-ld} -64"
3271+ ;;
3272+ esac
3273+ fi
3274 fi
3275 rm -rf conftest*
3276 ;;
3277
3278 x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
3279-s390*-*linux*|sparc*-*linux*)
3280+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
3281 # Find out which ABI we are using.
3282 echo 'int i;' > conftest.$ac_ext
3283 if AC_TRY_EVAL(ac_compile); then
3284 case `/usr/bin/file conftest.o` in
3285- *32-bit*)
3286- case $host in
3287- x86_64-*kfreebsd*-gnu)
3288- LD="${LD-ld} -m elf_i386_fbsd"
3289- ;;
3290- x86_64-*linux*)
3291- LD="${LD-ld} -m elf_i386"
3292- ;;
3293- ppc64-*linux*|powerpc64-*linux*)
3294- LD="${LD-ld} -m elf32ppclinux"
3295- ;;
3296- s390x-*linux*)
3297- LD="${LD-ld} -m elf_s390"
3298- ;;
3299- sparc64-*linux*)
3300- LD="${LD-ld} -m elf32_sparc"
3301- ;;
3302- esac
3303- ;;
3304- *64-bit*)
3305- case $host in
3306- x86_64-*kfreebsd*-gnu)
3307- LD="${LD-ld} -m elf_x86_64_fbsd"
3308- ;;
3309- x86_64-*linux*)
3310- LD="${LD-ld} -m elf_x86_64"
3311- ;;
3312- ppc*-*linux*|powerpc*-*linux*)
3313- LD="${LD-ld} -m elf64ppc"
3314- ;;
3315- s390*-*linux*)
3316- LD="${LD-ld} -m elf64_s390"
3317- ;;
3318- sparc*-*linux*)
3319- LD="${LD-ld} -m elf64_sparc"
3320- ;;
3321- esac
3322- ;;
3323+ *32-bit*)
3324+ case $host in
3325+ x86_64-*kfreebsd*-gnu)
3326+ LD="${LD-ld} -m elf_i386_fbsd"
3327+ ;;
3328+ x86_64-*linux*)
3329+ LD="${LD-ld} -m elf_i386"
3330+ ;;
3331+ ppc64-*linux*|powerpc64-*linux*)
3332+ LD="${LD-ld} -m elf32ppclinux"
3333+ ;;
3334+ s390x-*linux*)
3335+ LD="${LD-ld} -m elf_s390"
3336+ ;;
3337+ sparc64-*linux*)
3338+ LD="${LD-ld} -m elf32_sparc"
3339+ ;;
3340+ esac
3341+ ;;
3342+ *64-bit*)
3343+ case $host in
3344+ x86_64-*kfreebsd*-gnu)
3345+ LD="${LD-ld} -m elf_x86_64_fbsd"
3346+ ;;
3347+ x86_64-*linux*)
3348+ LD="${LD-ld} -m elf_x86_64"
3349+ ;;
3350+ ppc*-*linux*|powerpc*-*linux*)
3351+ LD="${LD-ld} -m elf64ppc"
3352+ ;;
3353+ s390*-*linux*|s390*-*tpf*)
3354+ LD="${LD-ld} -m elf64_s390"
3355+ ;;
3356+ sparc*-*linux*)
3357+ LD="${LD-ld} -m elf64_sparc"
3358+ ;;
3359+ esac
3360+ ;;
3361 esac
3362 fi
3363 rm -rf conftest*
3364@@ -594,7 +1337,7 @@
3365 CFLAGS="$CFLAGS -belf"
3366 AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
3367 [AC_LANG_PUSH(C)
3368- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
3369+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
3370 AC_LANG_POP])
3371 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
3372 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
3373@@ -609,37 +1352,74 @@
3374 *64-bit*)
3375 case $lt_cv_prog_gnu_ld in
3376 yes*) LD="${LD-ld} -m elf64_sparc" ;;
3377- *) LD="${LD-ld} -64" ;;
3378+ *)
3379+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
3380+ LD="${LD-ld} -64"
3381+ fi
3382+ ;;
3383 esac
3384 ;;
3385 esac
3386 fi
3387 rm -rf conftest*
3388 ;;
3389-
3390-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
3391-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
3392- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3393- AC_CHECK_TOOL(AS, as, false)
3394- AC_CHECK_TOOL(OBJDUMP, objdump, false)
3395- ;;
3396- ])
3397 esac
3398
3399 need_locks="$enable_libtool_lock"
3400-
3401-])# _LT_AC_LOCK
3402-
3403-
3404-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
3405+])# _LT_ENABLE_LOCK
3406+
3407+
3408+# _LT_CMD_OLD_ARCHIVE
3409+# -------------------
3410+m4_defun([_LT_CMD_OLD_ARCHIVE],
3411+[AC_CHECK_TOOL(AR, ar, false)
3412+test -z "$AR" && AR=ar
3413+test -z "$AR_FLAGS" && AR_FLAGS=cru
3414+_LT_DECL([], [AR], [1], [The archiver])
3415+_LT_DECL([], [AR_FLAGS], [1])
3416+
3417+AC_CHECK_TOOL(STRIP, strip, :)
3418+test -z "$STRIP" && STRIP=:
3419+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
3420+
3421+AC_CHECK_TOOL(RANLIB, ranlib, :)
3422+test -z "$RANLIB" && RANLIB=:
3423+_LT_DECL([], [RANLIB], [1],
3424+ [Commands used to install an old-style archive])
3425+
3426+# Determine commands to create old-style static archives.
3427+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
3428+old_postinstall_cmds='chmod 644 $oldlib'
3429+old_postuninstall_cmds=
3430+
3431+if test -n "$RANLIB"; then
3432+ case $host_os in
3433+ openbsd*)
3434+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
3435+ ;;
3436+ *)
3437+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
3438+ ;;
3439+ esac
3440+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
3441+fi
3442+_LT_DECL([], [old_postinstall_cmds], [2])
3443+_LT_DECL([], [old_postuninstall_cmds], [2])
3444+_LT_TAGDECL([], [old_archive_cmds], [2],
3445+ [Commands used to build an old-style archive])
3446+])# _LT_CMD_OLD_ARCHIVE
3447+
3448+
3449+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
3450 # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
3451 # ----------------------------------------------------------------
3452 # Check whether the given compiler option works
3453-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
3454-[AC_REQUIRE([LT_AC_PROG_SED])
3455+AC_DEFUN([_LT_COMPILER_OPTION],
3456+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3457+m4_require([_LT_DECL_SED])dnl
3458 AC_CACHE_CHECK([$1], [$2],
3459 [$2=no
3460- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
3461+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
3462 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
3463 lt_compiler_flag="$3"
3464 # Insert the option either (1) after the last *FLAGS variable, or
3465@@ -659,29 +1439,35 @@
3466 if (exit $ac_status) && test -s "$ac_outfile"; then
3467 # The compiler can only warn and ignore the option if not recognized
3468 # So say no if there are warnings other than the usual output.
3469- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
3470+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
3471 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3472 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
3473 $2=yes
3474 fi
3475 fi
3476- $rm conftest*
3477+ $RM conftest*
3478 ])
3479
3480 if test x"[$]$2" = xyes; then
3481- ifelse([$5], , :, [$5])
3482+ m4_if([$5], , :, [$5])
3483 else
3484- ifelse([$6], , :, [$6])
3485+ m4_if([$6], , :, [$6])
3486 fi
3487-])# AC_LIBTOOL_COMPILER_OPTION
3488-
3489-
3490-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
3491-# [ACTION-SUCCESS], [ACTION-FAILURE])
3492-# ------------------------------------------------------------
3493-# Check whether the given compiler option works
3494-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
3495-[AC_REQUIRE([LT_AC_PROG_SED])dnl
3496+])# _LT_COMPILER_OPTION
3497+
3498+# Old name:
3499+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
3500+dnl aclocal-1.4 backwards compatibility:
3501+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
3502+
3503+
3504+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
3505+# [ACTION-SUCCESS], [ACTION-FAILURE])
3506+# ----------------------------------------------------
3507+# Check whether the given linker option works
3508+AC_DEFUN([_LT_LINKER_OPTION],
3509+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3510+m4_require([_LT_DECL_SED])dnl
3511 AC_CACHE_CHECK([$1], [$2],
3512 [$2=no
3513 save_LDFLAGS="$LDFLAGS"
3514@@ -693,7 +1479,7 @@
3515 if test -s conftest.err; then
3516 # Append any errors to the config.log.
3517 cat conftest.err 1>&AS_MESSAGE_LOG_FD
3518- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3519+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
3520 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
3521 if diff conftest.exp conftest.er2 >/dev/null; then
3522 $2=yes
3523@@ -702,22 +1488,28 @@
3524 $2=yes
3525 fi
3526 fi
3527- $rm conftest*
3528+ $RM -r conftest*
3529 LDFLAGS="$save_LDFLAGS"
3530 ])
3531
3532 if test x"[$]$2" = xyes; then
3533- ifelse([$4], , :, [$4])
3534+ m4_if([$4], , :, [$4])
3535 else
3536- ifelse([$5], , :, [$5])
3537+ m4_if([$5], , :, [$5])
3538 fi
3539-])# AC_LIBTOOL_LINKER_OPTION
3540-
3541-
3542-# AC_LIBTOOL_SYS_MAX_CMD_LEN
3543-# --------------------------
3544-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
3545-[# find the maximum length of command line arguments
3546+])# _LT_LINKER_OPTION
3547+
3548+# Old name:
3549+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
3550+dnl aclocal-1.4 backwards compatibility:
3551+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
3552+
3553+
3554+# LT_CMD_MAX_LEN
3555+#---------------
3556+AC_DEFUN([LT_CMD_MAX_LEN],
3557+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3558+# find the maximum length of command line arguments
3559 AC_MSG_CHECKING([the maximum length of command line arguments])
3560 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
3561 i=0
3562@@ -739,7 +1531,7 @@
3563 lt_cv_sys_max_cmd_len=-1;
3564 ;;
3565
3566- cygwin* | mingw*)
3567+ cygwin* | mingw* | cegcc*)
3568 # On Win9x/ME, this test blows up -- it succeeds, but takes
3569 # about 5 minutes as the teststring grows exponentially.
3570 # Worse, since 9x/ME are not pre-emptively multitasking,
3571@@ -794,7 +1586,7 @@
3572 sysv5* | sco5v6* | sysv4.2uw2*)
3573 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
3574 if test -n "$kargmax"; then
3575- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
3576+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
3577 else
3578 lt_cv_sys_max_cmd_len=32768
3579 fi
3580@@ -805,20 +1597,28 @@
3581 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
3582 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
3583 else
3584+ # Make teststring a little bigger before we do anything with it.
3585+ # a 1K string should be a reasonable start.
3586+ for i in 1 2 3 4 5 6 7 8 ; do
3587+ teststring=$teststring$teststring
3588+ done
3589 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
3590- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
3591- = "XX$teststring") >/dev/null 2>&1 &&
3592- new_result=`expr "X$teststring" : ".*" 2>&1` &&
3593- lt_cv_sys_max_cmd_len=$new_result &&
3594+ # If test is not a shell built-in, we'll probably end up computing a
3595+ # maximum length that is only half of the actual maximum length, but
3596+ # we can't tell.
3597+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
3598+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
3599 test $i != 17 # 1/2 MB should be enough
3600 do
3601 i=`expr $i + 1`
3602 teststring=$teststring$teststring
3603 done
3604+ # Only check the string length outside the loop.
3605+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
3606 teststring=
3607- # Add a significant safety factor because C++ compilers can tack on massive
3608- # amounts of additional arguments before passing them to the linker.
3609- # It appears as though 1/2 is a usable value.
3610+ # Add a significant safety factor because C++ compilers can tack on
3611+ # massive amounts of additional arguments before passing them to the
3612+ # linker. It appears as though 1/2 is a usable value.
3613 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
3614 fi
3615 ;;
3616@@ -829,27 +1629,35 @@
3617 else
3618 AC_MSG_RESULT(none)
3619 fi
3620-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
3621-
3622-
3623-# _LT_AC_CHECK_DLFCN
3624-# ------------------
3625-AC_DEFUN([_LT_AC_CHECK_DLFCN],
3626-[AC_CHECK_HEADERS(dlfcn.h)dnl
3627-])# _LT_AC_CHECK_DLFCN
3628-
3629-
3630-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
3631-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
3632-# ---------------------------------------------------------------------
3633-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
3634-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
3635+max_cmd_len=$lt_cv_sys_max_cmd_len
3636+_LT_DECL([], [max_cmd_len], [0],
3637+ [What is the maximum length of a command?])
3638+])# LT_CMD_MAX_LEN
3639+
3640+# Old name:
3641+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
3642+dnl aclocal-1.4 backwards compatibility:
3643+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
3644+
3645+
3646+# _LT_HEADER_DLFCN
3647+# ----------------
3648+m4_defun([_LT_HEADER_DLFCN],
3649+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
3650+])# _LT_HEADER_DLFCN
3651+
3652+
3653+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
3654+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
3655+# ----------------------------------------------------------------
3656+m4_defun([_LT_TRY_DLOPEN_SELF],
3657+[m4_require([_LT_HEADER_DLFCN])dnl
3658 if test "$cross_compiling" = yes; then :
3659 [$4]
3660 else
3661 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
3662 lt_status=$lt_dlunknown
3663- cat > conftest.$ac_ext <<EOF
3664+ cat > conftest.$ac_ext <<_LT_EOF
3665 [#line __oline__ "configure"
3666 #include "confdefs.h"
3667
3668@@ -891,10 +1699,6 @@
3669 # endif
3670 #endif
3671
3672-#ifdef __cplusplus
3673-extern "C" void exit (int);
3674-#endif
3675-
3676 void fnord() { int i=42;}
3677 int main ()
3678 {
3679@@ -910,9 +1714,9 @@
3680 else
3681 puts (dlerror ());
3682
3683- exit (status);
3684+ return status;
3685 }]
3686-EOF
3687+_LT_EOF
3688 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
3689 (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
3690 lt_status=$?
3691@@ -927,13 +1731,13 @@
3692 fi
3693 fi
3694 rm -fr conftest*
3695-])# _LT_AC_TRY_DLOPEN_SELF
3696-
3697-
3698-# AC_LIBTOOL_DLOPEN_SELF
3699-# ----------------------
3700-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
3701-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
3702+])# _LT_TRY_DLOPEN_SELF
3703+
3704+
3705+# LT_SYS_DLOPEN_SELF
3706+# ------------------
3707+AC_DEFUN([LT_SYS_DLOPEN_SELF],
3708+[m4_require([_LT_HEADER_DLFCN])dnl
3709 if test "x$enable_dlopen" != xyes; then
3710 enable_dlopen=unknown
3711 enable_dlopen_self=unknown
3712@@ -949,15 +1753,15 @@
3713 lt_cv_dlopen_self=yes
3714 ;;
3715
3716- mingw* | pw32*)
3717+ mingw* | pw32* | cegcc*)
3718 lt_cv_dlopen="LoadLibrary"
3719 lt_cv_dlopen_libs=
3720- ;;
3721+ ;;
3722
3723 cygwin*)
3724 lt_cv_dlopen="dlopen"
3725 lt_cv_dlopen_libs=
3726- ;;
3727+ ;;
3728
3729 darwin*)
3730 # if libdl is installed we need to link against it
3731@@ -967,13 +1771,13 @@
3732 lt_cv_dlopen_libs=
3733 lt_cv_dlopen_self=yes
3734 ])
3735- ;;
3736+ ;;
3737
3738 *)
3739 AC_CHECK_FUNC([shl_load],
3740 [lt_cv_dlopen="shl_load"],
3741 [AC_CHECK_LIB([dld], [shl_load],
3742- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
3743+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
3744 [AC_CHECK_FUNC([dlopen],
3745 [lt_cv_dlopen="dlopen"],
3746 [AC_CHECK_LIB([dl], [dlopen],
3747@@ -981,7 +1785,7 @@
3748 [AC_CHECK_LIB([svld], [dlopen],
3749 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
3750 [AC_CHECK_LIB([dld], [dld_link],
3751- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
3752+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
3753 ])
3754 ])
3755 ])
3756@@ -1009,7 +1813,7 @@
3757
3758 AC_CACHE_CHECK([whether a program can dlopen itself],
3759 lt_cv_dlopen_self, [dnl
3760- _LT_AC_TRY_DLOPEN_SELF(
3761+ _LT_TRY_DLOPEN_SELF(
3762 lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
3763 lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
3764 ])
3765@@ -1017,8 +1821,8 @@
3766 if test "x$lt_cv_dlopen_self" = xyes; then
3767 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
3768 AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
3769- lt_cv_dlopen_self_static, [dnl
3770- _LT_AC_TRY_DLOPEN_SELF(
3771+ lt_cv_dlopen_self_static, [dnl
3772+ _LT_TRY_DLOPEN_SELF(
3773 lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
3774 lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
3775 ])
3776@@ -1040,19 +1844,32 @@
3777 *) enable_dlopen_self_static=unknown ;;
3778 esac
3779 fi
3780-])# AC_LIBTOOL_DLOPEN_SELF
3781-
3782-
3783-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
3784-# ---------------------------------
3785-# Check to see if options -c and -o are simultaneously supported by compiler
3786-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
3787-[AC_REQUIRE([LT_AC_PROG_SED])dnl
3788-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
3789+_LT_DECL([dlopen_support], [enable_dlopen], [0],
3790+ [Whether dlopen is supported])
3791+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
3792+ [Whether dlopen of programs is supported])
3793+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
3794+ [Whether dlopen of statically linked programs is supported])
3795+])# LT_SYS_DLOPEN_SELF
3796+
3797+# Old name:
3798+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
3799+dnl aclocal-1.4 backwards compatibility:
3800+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
3801+
3802+
3803+# _LT_COMPILER_C_O([TAGNAME])
3804+# ---------------------------
3805+# Check to see if options -c and -o are simultaneously supported by compiler.
3806+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
3807+m4_defun([_LT_COMPILER_C_O],
3808+[m4_require([_LT_DECL_SED])dnl
3809+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3810+m4_require([_LT_TAG_COMPILER])dnl
3811 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
3812- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
3813- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
3814- $rm -r conftest 2>/dev/null
3815+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
3816+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
3817+ $RM -r conftest 2>/dev/null
3818 mkdir conftest
3819 cd conftest
3820 mkdir out
3821@@ -1076,37 +1893,41 @@
3822 then
3823 # The compiler can only warn and ignore the option if not recognized
3824 # So say no if there are warnings
3825- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
3826+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
3827 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
3828 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
3829- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
3830+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
3831 fi
3832 fi
3833 chmod u+w . 2>&AS_MESSAGE_LOG_FD
3834- $rm conftest*
3835+ $RM conftest*
3836 # SGI C++ compiler will create directory out/ii_files/ for
3837 # template instantiation
3838- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
3839- $rm out/* && rmdir out
3840+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
3841+ $RM out/* && rmdir out
3842 cd ..
3843- rmdir conftest
3844- $rm conftest*
3845+ $RM -r conftest
3846+ $RM conftest*
3847 ])
3848-])# AC_LIBTOOL_PROG_CC_C_O
3849-
3850-
3851-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
3852-# -----------------------------------------
3853+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
3854+ [Does compiler simultaneously support -c and -o options?])
3855+])# _LT_COMPILER_C_O
3856+
3857+
3858+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
3859+# ----------------------------------
3860 # Check to see if we can do hard links to lock some files if needed
3861-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
3862-[AC_REQUIRE([_LT_AC_LOCK])dnl
3863+m4_defun([_LT_COMPILER_FILE_LOCKS],
3864+[m4_require([_LT_ENABLE_LOCK])dnl
3865+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
3866+_LT_COMPILER_C_O([$1])
3867
3868 hard_links="nottested"
3869-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
3870+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
3871 # do not overwrite the value of need_locks provided by the user
3872 AC_MSG_CHECKING([if we can lock with hard links])
3873 hard_links=yes
3874- $rm conftest*
3875+ $RM conftest*
3876 ln conftest.a conftest.b 2>/dev/null && hard_links=no
3877 touch conftest.a
3878 ln conftest.a conftest.b 2>&5 || hard_links=no
3879@@ -1119,12 +1940,13 @@
3880 else
3881 need_locks=no
3882 fi
3883-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
3884-
3885-
3886-# AC_LIBTOOL_OBJDIR
3887-# -----------------
3888-AC_DEFUN([AC_LIBTOOL_OBJDIR],
3889+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
3890+])# _LT_COMPILER_FILE_LOCKS
3891+
3892+
3893+# _LT_CHECK_OBJDIR
3894+# ----------------
3895+m4_defun([_LT_CHECK_OBJDIR],
3896 [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
3897 [rm -f .libs 2>/dev/null
3898 mkdir .libs 2>/dev/null
3899@@ -1136,40 +1958,46 @@
3900 fi
3901 rmdir .libs 2>/dev/null])
3902 objdir=$lt_cv_objdir
3903-])# AC_LIBTOOL_OBJDIR
3904-
3905-
3906-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
3907-# ----------------------------------------------
3908+_LT_DECL([], [objdir], [0],
3909+ [The name of the directory that contains temporary libtool files])dnl
3910+m4_pattern_allow([LT_OBJDIR])dnl
3911+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
3912+ [Define to the sub-directory in which libtool stores uninstalled libraries.])
3913+])# _LT_CHECK_OBJDIR
3914+
3915+
3916+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
3917+# --------------------------------------
3918 # Check hardcoding attributes.
3919-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
3920+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
3921 [AC_MSG_CHECKING([how to hardcode library paths into programs])
3922-_LT_AC_TAGVAR(hardcode_action, $1)=
3923-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
3924- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
3925- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
3926+_LT_TAGVAR(hardcode_action, $1)=
3927+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
3928+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
3929+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
3930
3931- # We can hardcode non-existant directories.
3932- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
3933+ # We can hardcode non-existent directories.
3934+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
3935 # If the only mechanism to avoid hardcoding is shlibpath_var, we
3936 # have to relink, otherwise we might link with an installed library
3937 # when we should be linking with a yet-to-be-installed one
3938- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
3939- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
3940+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
3941+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
3942 # Linking always hardcodes the temporary library directory.
3943- _LT_AC_TAGVAR(hardcode_action, $1)=relink
3944+ _LT_TAGVAR(hardcode_action, $1)=relink
3945 else
3946 # We can link without hardcoding, and we can hardcode nonexisting dirs.
3947- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
3948+ _LT_TAGVAR(hardcode_action, $1)=immediate
3949 fi
3950 else
3951 # We cannot hardcode anything, or else we can only hardcode existing
3952 # directories.
3953- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
3954+ _LT_TAGVAR(hardcode_action, $1)=unsupported
3955 fi
3956-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
3957+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
3958
3959-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
3960+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
3961+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
3962 # Fast installation is not supported
3963 enable_fast_install=no
3964 elif test "$shlibpath_overrides_runpath" = yes ||
3965@@ -1177,73 +2005,70 @@
3966 # Fast installation is not necessary
3967 enable_fast_install=needless
3968 fi
3969-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
3970-
3971-
3972-# AC_LIBTOOL_SYS_LIB_STRIP
3973-# ------------------------
3974-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
3975-[striplib=
3976+_LT_TAGDECL([], [hardcode_action], [0],
3977+ [How to hardcode a shared library path into an executable])
3978+])# _LT_LINKER_HARDCODE_LIBPATH
3979+
3980+
3981+# _LT_CMD_STRIPLIB
3982+# ----------------
3983+m4_defun([_LT_CMD_STRIPLIB],
3984+[m4_require([_LT_DECL_EGREP])
3985+striplib=
3986 old_striplib=
3987 AC_MSG_CHECKING([whether stripping libraries is possible])
3988-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
3989+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
3990 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
3991 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
3992 AC_MSG_RESULT([yes])
3993 else
3994 # FIXME - insert some real tests, host_os isn't really good enough
3995 case $host_os in
3996- darwin*)
3997- if test -n "$STRIP" ; then
3998- striplib="$STRIP -x"
3999- old_striplib="$STRIP -S"
4000- AC_MSG_RESULT([yes])
4001- else
4002- AC_MSG_RESULT([no])
4003-fi
4004- ;;
4005- *)
4006- AC_MSG_RESULT([no])
4007+ darwin*)
4008+ if test -n "$STRIP" ; then
4009+ striplib="$STRIP -x"
4010+ old_striplib="$STRIP -S"
4011+ AC_MSG_RESULT([yes])
4012+ else
4013+ AC_MSG_RESULT([no])
4014+ fi
4015+ ;;
4016+ *)
4017+ AC_MSG_RESULT([no])
4018 ;;
4019 esac
4020 fi
4021-])# AC_LIBTOOL_SYS_LIB_STRIP
4022-
4023-
4024-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4025+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
4026+_LT_DECL([], [striplib], [1])
4027+])# _LT_CMD_STRIPLIB
4028+
4029+
4030+# _LT_SYS_DYNAMIC_LINKER([TAG])
4031 # -----------------------------
4032 # PORTME Fill in your ld.so characteristics
4033-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
4034-[AC_REQUIRE([LT_AC_PROG_SED])dnl
4035+m4_defun([_LT_SYS_DYNAMIC_LINKER],
4036+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
4037+m4_require([_LT_DECL_EGREP])dnl
4038+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4039+m4_require([_LT_DECL_OBJDUMP])dnl
4040+m4_require([_LT_DECL_SED])dnl
4041 AC_MSG_CHECKING([dynamic linker characteristics])
4042-library_names_spec=
4043-libname_spec='lib$name'
4044-soname_spec=
4045-shrext_cmds=".so"
4046-postinstall_cmds=
4047-postuninstall_cmds=
4048-finish_cmds=
4049-finish_eval=
4050-shlibpath_var=
4051-shlibpath_overrides_runpath=unknown
4052-version_type=none
4053-dynamic_linker="$host_os ld.so"
4054-sys_lib_dlsearch_path_spec="/lib /usr/lib"
4055-m4_if($1,[],[
4056+m4_if([$1],
4057+ [], [
4058 if test "$GCC" = yes; then
4059 case $host_os in
4060 darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
4061 *) lt_awk_arg="/^libraries:/" ;;
4062 esac
4063 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4064- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
4065+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
4066 # if the path contains ";" then we assume it to be the separator
4067 # otherwise default to the standard path separator (i.e. ":") - it is
4068 # assumed that no part of a normal pathname contains ";" but that should
4069 # okay in the real world where ";" in dirpaths is itself problematic.
4070- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
4071+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
4072 else
4073- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4074+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4075 fi
4076 # Ok, now we have the path, separated by spaces, we can step through it
4077 # and add multilib dir if necessary.
4078@@ -1257,7 +2082,7 @@
4079 lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
4080 fi
4081 done
4082- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
4083+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
4084 BEGIN {RS=" "; FS="/|\n";} {
4085 lt_foo="";
4086 lt_count=0;
4087@@ -1277,10 +2102,23 @@
4088 if (lt_foo != "") { lt_freq[[lt_foo]]++; }
4089 if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
4090 }'`
4091- sys_lib_search_path_spec=`echo $lt_search_path_spec`
4092+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
4093 else
4094 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
4095 fi])
4096+library_names_spec=
4097+libname_spec='lib$name'
4098+soname_spec=
4099+shrext_cmds=".so"
4100+postinstall_cmds=
4101+postuninstall_cmds=
4102+finish_cmds=
4103+finish_eval=
4104+shlibpath_var=
4105+shlibpath_overrides_runpath=unknown
4106+version_type=none
4107+dynamic_linker="$host_os ld.so"
4108+sys_lib_dlsearch_path_spec="/lib /usr/lib"
4109 need_lib_prefix=unknown
4110 hardcode_into_libs=no
4111
4112@@ -1298,7 +2136,7 @@
4113 soname_spec='${libname}${release}${shared_ext}$major'
4114 ;;
4115
4116-aix4* | aix5*)
4117+aix[[4-9]]*)
4118 version_type=linux
4119 need_lib_prefix=no
4120 need_version=no
4121@@ -1317,7 +2155,7 @@
4122 aix4 | aix4.[[01]] | aix4.[[01]].*)
4123 if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
4124 echo ' yes '
4125- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
4126+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
4127 :
4128 else
4129 can_build_shared=no
4130@@ -1343,9 +2181,18 @@
4131 ;;
4132
4133 amigaos*)
4134- library_names_spec='$libname.ixlibrary $libname.a'
4135- # Create ${libname}_ixlibrary.a entries in /sys/libs.
4136- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
4137+ case $host_cpu in
4138+ powerpc)
4139+ # Since July 2007 AmigaOS4 officially supports .so libraries.
4140+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
4141+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4142+ ;;
4143+ m68k)
4144+ library_names_spec='$libname.ixlibrary $libname.a'
4145+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
4146+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
4147+ ;;
4148+ esac
4149 ;;
4150
4151 beos*)
4152@@ -1368,25 +2215,28 @@
4153 # libtool to hard-code these into programs
4154 ;;
4155
4156-cygwin* | mingw* | pw32*)
4157+cygwin* | mingw* | pw32* | cegcc*)
4158 version_type=windows
4159 shrext_cmds=".dll"
4160 need_version=no
4161 need_lib_prefix=no
4162
4163 case $GCC,$host_os in
4164- yes,cygwin* | yes,mingw* | yes,pw32*)
4165+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
4166 library_names_spec='$libname.dll.a'
4167 # DLL is installed to $(libdir)/../bin by postinstall_cmds
4168 postinstall_cmds='base_file=`basename \${file}`~
4169- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
4170+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
4171 dldir=$destdir/`dirname \$dlpath`~
4172 test -d \$dldir || mkdir -p \$dldir~
4173 $install_prog $dir/$dlname \$dldir/$dlname~
4174- chmod a+x \$dldir/$dlname'
4175+ chmod a+x \$dldir/$dlname~
4176+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
4177+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
4178+ fi'
4179 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
4180 dlpath=$dir/\$dldll~
4181- $rm \$dlpath'
4182+ $RM \$dlpath'
4183 shlibpath_overrides_runpath=yes
4184
4185 case $host_os in
4186@@ -1395,20 +2245,20 @@
4187 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4188 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
4189 ;;
4190- mingw*)
4191+ mingw* | cegcc*)
4192 # MinGW DLLs use traditional 'lib' prefix
4193 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
4194- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4195- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
4196+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
4197+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
4198 # It is most probably a Windows format PATH printed by
4199 # mingw gcc, but we are running on Cygwin. Gcc prints its search
4200 # path with ; separators, and with drive letters. We can handle the
4201 # drive letters (cygwin fileutils understands them), so leave them,
4202 # especially as we might pass files found there to a mingw objdump,
4203 # which wouldn't understand a cygwinified path. Ahh.
4204- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4205+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
4206 else
4207- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4208+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
4209 fi
4210 ;;
4211 pw32*)
4212@@ -1432,13 +2282,13 @@
4213 version_type=darwin
4214 need_lib_prefix=no
4215 need_version=no
4216- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
4217+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
4218 soname_spec='${libname}${release}${major}$shared_ext'
4219 shlibpath_overrides_runpath=yes
4220 shlibpath_var=DYLD_LIBRARY_PATH
4221 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
4222- m4_if([$1], [],[
4223- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
4224+m4_if([$1], [],[
4225+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
4226 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
4227 ;;
4228
4229@@ -1531,18 +2381,18 @@
4230 fi
4231 sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
4232 ;;
4233- hppa*64*)
4234- shrext_cmds='.sl'
4235- hardcode_into_libs=yes
4236- dynamic_linker="$host_os dld.sl"
4237- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
4238- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
4239- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4240- soname_spec='${libname}${release}${shared_ext}$major'
4241- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
4242- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
4243- ;;
4244- *)
4245+ hppa*64*)
4246+ shrext_cmds='.sl'
4247+ hardcode_into_libs=yes
4248+ dynamic_linker="$host_os dld.sl"
4249+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
4250+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
4251+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4252+ soname_spec='${libname}${release}${shared_ext}$major'
4253+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
4254+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
4255+ ;;
4256+ *)
4257 shrext_cmds='.sl'
4258 dynamic_linker="$host_os dld.sl"
4259 shlibpath_var=SHLIB_PATH
4260@@ -1610,7 +2460,7 @@
4261 ;;
4262
4263 # This must be Linux ELF.
4264-linux* | k*bsd*-gnu)
4265+linux* | k*bsd*-gnu | kopensolaris*-gnu)
4266 version_type=linux
4267 need_lib_prefix=no
4268 need_version=no
4269@@ -1619,6 +2469,17 @@
4270 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4271 shlibpath_var=LD_LIBRARY_PATH
4272 shlibpath_overrides_runpath=no
4273+ # Some binutils ld are patched to set DT_RUNPATH
4274+ save_LDFLAGS=$LDFLAGS
4275+ save_libdir=$libdir
4276+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
4277+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
4278+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
4279+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
4280+ [shlibpath_overrides_runpath=yes])])
4281+ LDFLAGS=$save_LDFLAGS
4282+ libdir=$save_libdir
4283+
4284 # This implies no fast_install, which is unacceptable.
4285 # Some rework will be needed to allow for fast_install
4286 # before this can be enabled.
4287@@ -1626,7 +2487,7 @@
4288
4289 # Append ld.so.conf contents to the search path
4290 if test -f /etc/ld.so.conf; then
4291- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
4292+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
4293 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
4294 fi
4295
4296@@ -1655,7 +2516,7 @@
4297 version_type=sunos
4298 need_lib_prefix=no
4299 need_version=no
4300- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
4301+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4302 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4303 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4304 dynamic_linker='NetBSD (a.out) ld.so'
4305@@ -1676,14 +2537,16 @@
4306 shlibpath_overrides_runpath=yes
4307 ;;
4308
4309-nto-qnx*)
4310- version_type=linux
4311+*nto* | *qnx*)
4312+ version_type=qnx
4313 need_lib_prefix=no
4314 need_version=no
4315 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4316 soname_spec='${libname}${release}${shared_ext}$major'
4317 shlibpath_var=LD_LIBRARY_PATH
4318- shlibpath_overrides_runpath=yes
4319+ shlibpath_overrides_runpath=no
4320+ hardcode_into_libs=yes
4321+ dynamic_linker='ldqnx.so'
4322 ;;
4323
4324 openbsd*)
4325@@ -1692,13 +2555,13 @@
4326 need_lib_prefix=no
4327 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
4328 case $host_os in
4329- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
4330- *) need_version=no ;;
4331+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
4332+ *) need_version=no ;;
4333 esac
4334 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4335 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4336 shlibpath_var=LD_LIBRARY_PATH
4337- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4338+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4339 case $host_os in
4340 openbsd2.[[89]] | openbsd2.[[89]].*)
4341 shlibpath_overrides_runpath=no
4342@@ -1770,7 +2633,6 @@
4343 sni)
4344 shlibpath_overrides_runpath=no
4345 need_lib_prefix=no
4346- export_dynamic_flag_spec='${wl}-Blargedynsym'
4347 runpath_var=LD_RUN_PATH
4348 ;;
4349 siemens)
4350@@ -1801,13 +2663,12 @@
4351 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
4352 soname_spec='${libname}${release}${shared_ext}$major'
4353 shlibpath_var=LD_LIBRARY_PATH
4354+ shlibpath_overrides_runpath=yes
4355 hardcode_into_libs=yes
4356 if test "$with_gnu_ld" = yes; then
4357 sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
4358- shlibpath_overrides_runpath=no
4359 else
4360 sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
4361- shlibpath_overrides_runpath=yes
4362 case $host_os in
4363 sco3.2v5*)
4364 sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
4365@@ -1817,6 +2678,17 @@
4366 sys_lib_dlsearch_path_spec='/usr/lib'
4367 ;;
4368
4369+tpf*)
4370+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
4371+ version_type=linux
4372+ need_lib_prefix=no
4373+ need_version=no
4374+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4375+ shlibpath_var=LD_LIBRARY_PATH
4376+ shlibpath_overrides_runpath=no
4377+ hardcode_into_libs=yes
4378+ ;;
4379+
4380 uts4*)
4381 version_type=linux
4382 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4383@@ -1835,277 +2707,54 @@
4384 if test "$GCC" = yes; then
4385 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
4386 fi
4387-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4388-
4389-
4390-# _LT_AC_TAGCONFIG
4391-# ----------------
4392-AC_DEFUN([_LT_AC_TAGCONFIG],
4393-[AC_REQUIRE([LT_AC_PROG_SED])dnl
4394-AC_ARG_WITH([tags],
4395- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
4396- [include additional configurations @<:@automatic@:>@])],
4397- [tagnames="$withval"])
4398-
4399-if test -f "$ltmain" && test -n "$tagnames"; then
4400- if test ! -f "${ofile}"; then
4401- AC_MSG_WARN([output file `$ofile' does not exist])
4402- fi
4403-
4404- if test -z "$LTCC"; then
4405- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
4406- if test -z "$LTCC"; then
4407- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
4408- else
4409- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
4410- fi
4411- fi
4412- if test -z "$LTCFLAGS"; then
4413- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
4414- fi
4415-
4416- # Extract list of available tagged configurations in $ofile.
4417- # Note that this assumes the entire list is on one line.
4418- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
4419-
4420- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4421- for tagname in $tagnames; do
4422- IFS="$lt_save_ifs"
4423- # Check whether tagname contains only valid characters
4424- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
4425- "") ;;
4426- *) AC_MSG_ERROR([invalid tag name: $tagname])
4427- ;;
4428- esac
4429-
4430- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
4431- then
4432- AC_MSG_ERROR([tag name \"$tagname\" already exists])
4433- fi
4434-
4435- # Update the list of available tags.
4436- if test -n "$tagname"; then
4437- echo appending configuration tag \"$tagname\" to $ofile
4438-
4439- case $tagname in
4440- CXX)
4441- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
4442- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
4443- (test "X$CXX" != "Xg++"))) ; then
4444- AC_LIBTOOL_LANG_CXX_CONFIG
4445- else
4446- tagname=""
4447- fi
4448- ;;
4449-
4450- F77)
4451- if test -n "$F77" && test "X$F77" != "Xno"; then
4452- AC_LIBTOOL_LANG_F77_CONFIG
4453- else
4454- tagname=""
4455- fi
4456- ;;
4457-
4458- GCJ)
4459- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
4460- AC_LIBTOOL_LANG_GCJ_CONFIG
4461- else
4462- tagname=""
4463- fi
4464- ;;
4465-
4466- RC)
4467- AC_LIBTOOL_LANG_RC_CONFIG
4468- ;;
4469-
4470- *)
4471- AC_MSG_ERROR([Unsupported tag name: $tagname])
4472- ;;
4473- esac
4474-
4475- # Append the new tag name to the list of available tags.
4476- if test -n "$tagname" ; then
4477- available_tags="$available_tags $tagname"
4478- fi
4479- fi
4480- done
4481- IFS="$lt_save_ifs"
4482-
4483- # Now substitute the updated list of available tags.
4484- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
4485- mv "${ofile}T" "$ofile"
4486- chmod +x "$ofile"
4487- else
4488- rm -f "${ofile}T"
4489- AC_MSG_ERROR([unable to update list of available tagged configurations.])
4490- fi
4491-fi
4492-])# _LT_AC_TAGCONFIG
4493-
4494-
4495-# AC_LIBTOOL_DLOPEN
4496-# -----------------
4497-# enable checks for dlopen support
4498-AC_DEFUN([AC_LIBTOOL_DLOPEN],
4499- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
4500-])# AC_LIBTOOL_DLOPEN
4501-
4502-
4503-# AC_LIBTOOL_WIN32_DLL
4504-# --------------------
4505-# declare package support for building win32 DLLs
4506-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
4507-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
4508-])# AC_LIBTOOL_WIN32_DLL
4509-
4510-
4511-# AC_ENABLE_SHARED([DEFAULT])
4512-# ---------------------------
4513-# implement the --enable-shared flag
4514-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4515-AC_DEFUN([AC_ENABLE_SHARED],
4516-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
4517-AC_ARG_ENABLE([shared],
4518- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
4519- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
4520- [p=${PACKAGE-default}
4521- case $enableval in
4522- yes) enable_shared=yes ;;
4523- no) enable_shared=no ;;
4524- *)
4525- enable_shared=no
4526- # Look at the argument we got. We use all the common list separators.
4527- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4528- for pkg in $enableval; do
4529- IFS="$lt_save_ifs"
4530- if test "X$pkg" = "X$p"; then
4531- enable_shared=yes
4532- fi
4533- done
4534- IFS="$lt_save_ifs"
4535- ;;
4536- esac],
4537- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
4538-])# AC_ENABLE_SHARED
4539-
4540-
4541-# AC_DISABLE_SHARED
4542-# -----------------
4543-# set the default shared flag to --disable-shared
4544-AC_DEFUN([AC_DISABLE_SHARED],
4545-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4546-AC_ENABLE_SHARED(no)
4547-])# AC_DISABLE_SHARED
4548-
4549-
4550-# AC_ENABLE_STATIC([DEFAULT])
4551-# ---------------------------
4552-# implement the --enable-static flag
4553-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4554-AC_DEFUN([AC_ENABLE_STATIC],
4555-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
4556-AC_ARG_ENABLE([static],
4557- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
4558- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
4559- [p=${PACKAGE-default}
4560- case $enableval in
4561- yes) enable_static=yes ;;
4562- no) enable_static=no ;;
4563- *)
4564- enable_static=no
4565- # Look at the argument we got. We use all the common list separators.
4566- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4567- for pkg in $enableval; do
4568- IFS="$lt_save_ifs"
4569- if test "X$pkg" = "X$p"; then
4570- enable_static=yes
4571- fi
4572- done
4573- IFS="$lt_save_ifs"
4574- ;;
4575- esac],
4576- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
4577-])# AC_ENABLE_STATIC
4578-
4579-
4580-# AC_DISABLE_STATIC
4581-# -----------------
4582-# set the default static flag to --disable-static
4583-AC_DEFUN([AC_DISABLE_STATIC],
4584-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4585-AC_ENABLE_STATIC(no)
4586-])# AC_DISABLE_STATIC
4587-
4588-
4589-# AC_ENABLE_FAST_INSTALL([DEFAULT])
4590-# ---------------------------------
4591-# implement the --enable-fast-install flag
4592-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4593-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
4594-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
4595-AC_ARG_ENABLE([fast-install],
4596- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
4597- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
4598- [p=${PACKAGE-default}
4599- case $enableval in
4600- yes) enable_fast_install=yes ;;
4601- no) enable_fast_install=no ;;
4602- *)
4603- enable_fast_install=no
4604- # Look at the argument we got. We use all the common list separators.
4605- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4606- for pkg in $enableval; do
4607- IFS="$lt_save_ifs"
4608- if test "X$pkg" = "X$p"; then
4609- enable_fast_install=yes
4610- fi
4611- done
4612- IFS="$lt_save_ifs"
4613- ;;
4614- esac],
4615- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
4616-])# AC_ENABLE_FAST_INSTALL
4617-
4618-
4619-# AC_DISABLE_FAST_INSTALL
4620-# -----------------------
4621-# set the default to --disable-fast-install
4622-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
4623-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4624-AC_ENABLE_FAST_INSTALL(no)
4625-])# AC_DISABLE_FAST_INSTALL
4626-
4627-
4628-# AC_LIBTOOL_PICMODE([MODE])
4629+
4630+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
4631+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
4632+fi
4633+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
4634+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
4635+fi
4636+
4637+_LT_DECL([], [variables_saved_for_relink], [1],
4638+ [Variables whose values should be saved in libtool wrapper scripts and
4639+ restored at link time])
4640+_LT_DECL([], [need_lib_prefix], [0],
4641+ [Do we need the "lib" prefix for modules?])
4642+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
4643+_LT_DECL([], [version_type], [0], [Library versioning type])
4644+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
4645+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
4646+_LT_DECL([], [shlibpath_overrides_runpath], [0],
4647+ [Is shlibpath searched before the hard-coded library search path?])
4648+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
4649+_LT_DECL([], [library_names_spec], [1],
4650+ [[List of archive names. First name is the real one, the rest are links.
4651+ The last name is the one that the linker finds with -lNAME]])
4652+_LT_DECL([], [soname_spec], [1],
4653+ [[The coded name of the library, if different from the real name]])
4654+_LT_DECL([], [postinstall_cmds], [2],
4655+ [Command to use after installation of a shared archive])
4656+_LT_DECL([], [postuninstall_cmds], [2],
4657+ [Command to use after uninstallation of a shared archive])
4658+_LT_DECL([], [finish_cmds], [2],
4659+ [Commands used to finish a libtool library installation in a directory])
4660+_LT_DECL([], [finish_eval], [1],
4661+ [[As "finish_cmds", except a single script fragment to be evaled but
4662+ not shown]])
4663+_LT_DECL([], [hardcode_into_libs], [0],
4664+ [Whether we should hardcode library paths into libraries])
4665+_LT_DECL([], [sys_lib_search_path_spec], [2],
4666+ [Compile-time system search path for libraries])
4667+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
4668+ [Run-time system search path for libraries])
4669+])# _LT_SYS_DYNAMIC_LINKER
4670+
4671+
4672+# _LT_PATH_TOOL_PREFIX(TOOL)
4673 # --------------------------
4674-# implement the --with-pic flag
4675-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
4676-AC_DEFUN([AC_LIBTOOL_PICMODE],
4677-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4678-pic_mode=ifelse($#,1,$1,default)
4679-])# AC_LIBTOOL_PICMODE
4680-
4681-
4682-# AC_PROG_EGREP
4683-# -------------
4684-# This is predefined starting with Autoconf 2.54, so this conditional
4685-# definition can be removed once we require Autoconf 2.54 or later.
4686-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
4687-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
4688- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
4689- then ac_cv_prog_egrep='grep -E'
4690- else ac_cv_prog_egrep='egrep'
4691- fi])
4692- EGREP=$ac_cv_prog_egrep
4693- AC_SUBST([EGREP])
4694-])])
4695-
4696-
4697-# AC_PATH_TOOL_PREFIX
4698-# -------------------
4699 # find a file program which can recognize shared library
4700-AC_DEFUN([AC_PATH_TOOL_PREFIX],
4701-[AC_REQUIRE([AC_PROG_EGREP])dnl
4702+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
4703+[m4_require([_LT_DECL_EGREP])dnl
4704 AC_MSG_CHECKING([for $1])
4705 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
4706 [case $MAGIC_CMD in
4707@@ -2118,7 +2767,7 @@
4708 dnl $ac_dummy forces splitting on constant user-supplied paths.
4709 dnl POSIX.2 word splitting is done only on the output of word expansions,
4710 dnl not every word. This closes a longstanding sh security hole.
4711- ac_dummy="ifelse([$2], , $PATH, [$2])"
4712+ ac_dummy="m4_if([$2], , $PATH, [$2])"
4713 for ac_dir in $ac_dummy; do
4714 IFS="$lt_save_ifs"
4715 test -z "$ac_dir" && ac_dir=.
4716@@ -2133,7 +2782,7 @@
4717 $EGREP "$file_magic_regex" > /dev/null; then
4718 :
4719 else
4720- cat <<EOF 1>&2
4721+ cat <<_LT_EOF 1>&2
4722
4723 *** Warning: the command libtool uses to detect shared libraries,
4724 *** $file_magic_cmd, produces output that libtool cannot recognize.
4725@@ -2144,7 +2793,7 @@
4726 *** may want to report the problem to your system manager and/or to
4727 *** bug-libtool@gnu.org
4728
4729-EOF
4730+_LT_EOF
4731 fi ;;
4732 esac
4733 fi
4734@@ -2161,37 +2810,47 @@
4735 else
4736 AC_MSG_RESULT(no)
4737 fi
4738-])# AC_PATH_TOOL_PREFIX
4739-
4740-
4741-# AC_PATH_MAGIC
4742-# -------------
4743+_LT_DECL([], [MAGIC_CMD], [0],
4744+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl
4745+])# _LT_PATH_TOOL_PREFIX
4746+
4747+# Old name:
4748+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
4749+dnl aclocal-1.4 backwards compatibility:
4750+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
4751+
4752+
4753+# _LT_PATH_MAGIC
4754+# --------------
4755 # find a file program which can recognize a shared library
4756-AC_DEFUN([AC_PATH_MAGIC],
4757-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
4758+m4_defun([_LT_PATH_MAGIC],
4759+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
4760 if test -z "$lt_cv_path_MAGIC_CMD"; then
4761 if test -n "$ac_tool_prefix"; then
4762- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
4763+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
4764 else
4765 MAGIC_CMD=:
4766 fi
4767 fi
4768-])# AC_PATH_MAGIC
4769-
4770-
4771-# AC_PROG_LD
4772+])# _LT_PATH_MAGIC
4773+
4774+
4775+# LT_PATH_LD
4776 # ----------
4777 # find the pathname to the GNU or non-GNU linker
4778-AC_DEFUN([AC_PROG_LD],
4779-[AC_ARG_WITH([gnu-ld],
4780- [AC_HELP_STRING([--with-gnu-ld],
4781+AC_DEFUN([LT_PATH_LD],
4782+[AC_REQUIRE([AC_PROG_CC])dnl
4783+AC_REQUIRE([AC_CANONICAL_HOST])dnl
4784+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
4785+m4_require([_LT_DECL_SED])dnl
4786+m4_require([_LT_DECL_EGREP])dnl
4787+
4788+AC_ARG_WITH([gnu-ld],
4789+ [AS_HELP_STRING([--with-gnu-ld],
4790 [assume the C compiler uses GNU ld @<:@default=no@:>@])],
4791 [test "$withval" = no || with_gnu_ld=yes],
4792- [with_gnu_ld=no])
4793-AC_REQUIRE([LT_AC_PROG_SED])dnl
4794-AC_REQUIRE([AC_PROG_CC])dnl
4795-AC_REQUIRE([AC_CANONICAL_HOST])dnl
4796-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
4797+ [with_gnu_ld=no])dnl
4798+
4799 ac_prog=ld
4800 if test "$GCC" = yes; then
4801 # Check if gcc -print-prog-name=ld gives a path.
4802@@ -2208,9 +2867,9 @@
4803 [[\\/]]* | ?:[[\\/]]*)
4804 re_direlt='/[[^/]][[^/]]*/\.\./'
4805 # Canonicalize the pathname of ld
4806- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
4807- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
4808- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
4809+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
4810+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
4811+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
4812 done
4813 test -z "$LD" && LD="$ac_prog"
4814 ;;
4815@@ -2260,15 +2919,24 @@
4816 AC_MSG_RESULT(no)
4817 fi
4818 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
4819-AC_PROG_LD_GNU
4820-])# AC_PROG_LD
4821-
4822-
4823-# AC_PROG_LD_GNU
4824-# --------------
4825-AC_DEFUN([AC_PROG_LD_GNU],
4826-[AC_REQUIRE([AC_PROG_EGREP])dnl
4827-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
4828+_LT_PATH_LD_GNU
4829+AC_SUBST([LD])
4830+
4831+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
4832+])# LT_PATH_LD
4833+
4834+# Old names:
4835+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
4836+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
4837+dnl aclocal-1.4 backwards compatibility:
4838+dnl AC_DEFUN([AM_PROG_LD], [])
4839+dnl AC_DEFUN([AC_PROG_LD], [])
4840+
4841+
4842+# _LT_PATH_LD_GNU
4843+#- --------------
4844+m4_defun([_LT_PATH_LD_GNU],
4845+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
4846 [# I'd rather use --version here, but apparently some GNU lds only accept -v.
4847 case `$LD -v 2>&1 </dev/null` in
4848 *GNU* | *'with BFD'*)
4849@@ -2279,14 +2947,14 @@
4850 ;;
4851 esac])
4852 with_gnu_ld=$lt_cv_prog_gnu_ld
4853-])# AC_PROG_LD_GNU
4854-
4855-
4856-# AC_PROG_LD_RELOAD_FLAG
4857-# ----------------------
4858+])# _LT_PATH_LD_GNU
4859+
4860+
4861+# _LT_CMD_RELOAD
4862+# --------------
4863 # find reload flag for linker
4864 # -- PORTME Some linkers may need a different reload flag.
4865-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
4866+m4_defun([_LT_CMD_RELOAD],
4867 [AC_CACHE_CHECK([for $LD option to reload object files],
4868 lt_cv_ld_reload_flag,
4869 [lt_cv_ld_reload_flag='-r'])
4870@@ -2305,15 +2973,19 @@
4871 fi
4872 ;;
4873 esac
4874-])# AC_PROG_LD_RELOAD_FLAG
4875-
4876-
4877-# AC_DEPLIBS_CHECK_METHOD
4878-# -----------------------
4879+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
4880+_LT_DECL([], [reload_cmds], [2])dnl
4881+])# _LT_CMD_RELOAD
4882+
4883+
4884+# _LT_CHECK_MAGIC_METHOD
4885+# ----------------------
4886 # how to check for library dependencies
4887 # -- PORTME fill in with the dynamic library characteristics
4888-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
4889-[AC_CACHE_CHECK([how to recognize dependent libraries],
4890+m4_defun([_LT_CHECK_MAGIC_METHOD],
4891+[m4_require([_LT_DECL_EGREP])
4892+m4_require([_LT_DECL_OBJDUMP])
4893+AC_CACHE_CHECK([how to recognize dependent libraries],
4894 lt_cv_deplibs_check_method,
4895 [lt_cv_file_magic_cmd='$MAGIC_CMD'
4896 lt_cv_file_magic_test_file=
4897@@ -2330,7 +3002,7 @@
4898 # whether `pass_all' will *always* work, you probably want this one.
4899
4900 case $host_os in
4901-aix4* | aix5*)
4902+aix[[4-9]]*)
4903 lt_cv_deplibs_check_method=pass_all
4904 ;;
4905
4906@@ -2363,12 +3035,18 @@
4907 fi
4908 ;;
4909
4910+cegcc)
4911+ # use the weaker test based on 'objdump'. See mingw*.
4912+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
4913+ lt_cv_file_magic_cmd='$OBJDUMP -f'
4914+ ;;
4915+
4916 darwin* | rhapsody*)
4917 lt_cv_deplibs_check_method=pass_all
4918 ;;
4919
4920 freebsd* | dragonfly*)
4921- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
4922+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4923 case $host_cpu in
4924 i*86 )
4925 # Not sure whether the presence of OpenBSD here was a mistake.
4926@@ -2421,12 +3099,12 @@
4927 ;;
4928
4929 # This must be Linux ELF.
4930-linux* | k*bsd*-gnu)
4931+linux* | k*bsd*-gnu | kopensolaris*-gnu)
4932 lt_cv_deplibs_check_method=pass_all
4933 ;;
4934
4935 netbsd* | netbsdelf*-gnu)
4936- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
4937+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
4938 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4939 else
4940 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
4941@@ -2439,12 +3117,12 @@
4942 lt_cv_file_magic_test_file=/usr/lib/libnls.so
4943 ;;
4944
4945-nto-qnx*)
4946- lt_cv_deplibs_check_method=unknown
4947+*nto* | *qnx*)
4948+ lt_cv_deplibs_check_method=pass_all
4949 ;;
4950
4951 openbsd*)
4952- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4953+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4954 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
4955 else
4956 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
4957@@ -2463,6 +3141,10 @@
4958 lt_cv_deplibs_check_method=pass_all
4959 ;;
4960
4961+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4962+ lt_cv_deplibs_check_method=pass_all
4963+ ;;
4964+
4965 sysv4 | sysv4.3*)
4966 case $host_vendor in
4967 motorola)
4968@@ -2490,7 +3172,7 @@
4969 esac
4970 ;;
4971
4972-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4973+tpf*)
4974 lt_cv_deplibs_check_method=pass_all
4975 ;;
4976 esac
4977@@ -2498,14 +3180,20 @@
4978 file_magic_cmd=$lt_cv_file_magic_cmd
4979 deplibs_check_method=$lt_cv_deplibs_check_method
4980 test -z "$deplibs_check_method" && deplibs_check_method=unknown
4981-])# AC_DEPLIBS_CHECK_METHOD
4982-
4983-
4984-# AC_PROG_NM
4985+
4986+_LT_DECL([], [deplibs_check_method], [1],
4987+ [Method to check whether dependent libraries are shared objects])
4988+_LT_DECL([], [file_magic_cmd], [1],
4989+ [Command to use when deplibs_check_method == "file_magic"])
4990+])# _LT_CHECK_MAGIC_METHOD
4991+
4992+
4993+# LT_PATH_NM
4994 # ----------
4995-# find the pathname to a BSD-compatible name lister
4996-AC_DEFUN([AC_PROG_NM],
4997-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
4998+# find the pathname to a BSD- or MS-compatible name lister
4999+AC_DEFUN([LT_PATH_NM],
5000+[AC_REQUIRE([AC_PROG_CC])dnl
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches